From 9d4d11155540aea2c856961f58831e9620b0d226 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Sun, 6 Jan 2019 18:43:51 +0500
Subject: [PATCH] src/Cedar/CM: remove unused function, variables found by
 cppcheck

[src/Cedar/CM.c:4509]: (style) Variable 'easy' is assigned a value that is never used.
[src/Cedar/CM.c:4547]: (style) Variable 'hub_name' is assigned a value that is never used.
[src/Cedar/CM.c:4609]: (style) Variable 'is_account' is assigned a value that is never used.
[src/Cedar/CM.c:8545]: (style) The function 'CmLoadK' is never used.
---
 src/Cedar/CM.c      | 14 --------------
 src/Cedar/CMInner.h |  1 -
 2 files changed, 15 deletions(-)

diff --git a/src/Cedar/CM.c b/src/Cedar/CM.c
index 31e47d0d..4df71871 100644
--- a/src/Cedar/CM.c
+++ b/src/Cedar/CM.c
@@ -4504,9 +4504,6 @@ HMENU CmCreateRecentSubMenu(HWND hWnd, UINT start_id)
 	UINT i;
 	RPC_CLIENT_ENUM_ACCOUNT a;
 	LIST *o;
-	bool easy;
-
-	easy = cm->CmSetting.EasyMode;
 
 	Zero(&a, sizeof(a));
 
@@ -4534,7 +4531,6 @@ HMENU CmCreateRecentSubMenu(HWND hWnd, UINT start_id)
 			wchar_t tmp[MAX_PATH];
 			wchar_t *account_name;
 			char *server_name;
-			char *hub_name;
 			UINT pos;
 
 			if (h == NULL)
@@ -4544,7 +4540,6 @@ HMENU CmCreateRecentSubMenu(HWND hWnd, UINT start_id)
 
 			account_name = item->AccountName;
 			server_name = item->ServerName;
-			hub_name = item->HubName;
 
 			UniStrCpy(tmp, sizeof(tmp), account_name);
 
@@ -4586,7 +4581,6 @@ HMENU CmCreateTraySubMenu(HWND hWnd, bool flag, UINT start_id)
 		if (status_str != NULL)
 		{
 			bool b = false;
-			bool is_account = false;
 
 			if (UniStrCmpi(status_str, _UU("CM_ACCOUNT_OFFLINE")) == 0)
 			{
@@ -4594,8 +4588,6 @@ HMENU CmCreateTraySubMenu(HWND hWnd, bool flag, UINT start_id)
 				{
 					b = true;
 				}
-
-				is_account = true;
 			}
 
 			if (UniStrCmpi(status_str, _UU("CM_ACCOUNT_ONLINE")) == 0 ||
@@ -4605,8 +4597,6 @@ HMENU CmCreateTraySubMenu(HWND hWnd, bool flag, UINT start_id)
 				{
 					b = true;
 				}
-
-				is_account = true;
 			}
 
 			if (b)
@@ -8542,10 +8532,6 @@ bool CmLoadXExW(HWND hWnd, X **x, wchar_t *filename, UINT size)
 }
 
 // Read the secret key
-bool CmLoadK(HWND hWnd, K **k)
-{
-	return CmLoadKEx(hWnd, k, NULL, 0);
-}
 bool CmLoadKEx(HWND hWnd, K **k, char *filename, UINT size)
 {
 	wchar_t *filename_w = CopyStrToUni(filename);
diff --git a/src/Cedar/CMInner.h b/src/Cedar/CMInner.h
index 046042ec..764f619a 100644
--- a/src/Cedar/CMInner.h
+++ b/src/Cedar/CMInner.h
@@ -506,7 +506,6 @@ void CmEditAccountDlgInit(HWND hWnd, CM_ACCOUNT *a);
 void CmEditAccountDlgOnOk(HWND hWnd, CM_ACCOUNT *a);
 void CmEditAccountDlgStartEnumHub(HWND hWnd, CM_ACCOUNT *a);
 bool CmLoadXAndK(HWND hWnd, X **x, K **k);
-bool CmLoadK(HWND hWnd, K **k);
 bool CmLoadKEx(HWND hWnd, K **k, char *filename, UINT size);
 bool CmLoadKExW(HWND hWnd, K **k, wchar_t *filename, UINT size);
 bool CmLoadXFromFileOrSecureCard(HWND hWnd, X **x);