Merge PR #856: remove unused functions

src/Cedar/Account.c

@@ -159,18 +159,6 @@ POLICY_ITEM policy_item[] =
 	{37,	true,	true,	1,	4095,	0,	"POL_INT_VLAN"},	// VLanId
 };
 
-// Normalize policy name
-char *NormalizePolicyName(char *name)
-{
-	// Validate arguments
-	if (name == NULL)
-	{
-		return NULL;
-	}
-
-	return PolicyIdToStr(PolicyStrToId(name));
-}
-
 // Format policy value
 void FormatPolicyValue(wchar_t *str, UINT size, UINT id, UINT value)
 {
@@ -519,32 +507,6 @@ void SetUserPolicy(USER *u, POLICY *policy)
 	Unlock(u->lock);
 }
 
-// Get user policy
-POLICY *GetUserPolicy(USER *u)
-{
-	POLICY *ret;
-	// Validate arguments
-	if (u == NULL)
-	{
-		return NULL;
-	}
-
-	Lock(u->lock);
-	{
-		if (u->Policy == NULL)
-		{
-			ret = NULL;
-		}
-		else
-		{
-			ret = ClonePolicy(u->Policy);
-		}
-	}
-	Unlock(u->lock);
-
-	return ret;
-}
-
 // Set group policy
 void SetGroupPolicy(USERGROUP *g, POLICY *policy)
 {

src/Cedar/Account.h

@@ -295,7 +295,6 @@ POLICY *GetDefaultPolicy();
 POLICY *ClonePolicy(POLICY *policy);
 void SetUserPolicy(USER *u, POLICY *policy);
 void OverwritePolicy(POLICY **target, POLICY *p);
-POLICY *GetUserPolicy(USER *u);
 void SetGroupPolicy(USERGROUP *g, POLICY *policy);
 POLICY *GetGroupPolicy(USERGROUP *g);
 wchar_t *GetPolicyTitle(UINT id);
@@ -309,8 +308,6 @@ char *PolicyIdToStr(UINT i);
 POLICY_ITEM *GetPolicyItem(UINT id);
 void GetPolicyValueRangeStr(wchar_t *str, UINT size, UINT id);
 void FormatPolicyValue(wchar_t *str, UINT size, UINT id, UINT value);
-char *NormalizePolicyName(char *name);
-
 
 #endif	// ACCOUNT_H
 

src/Cedar/AzureClient.c

@@ -522,18 +522,6 @@ void AcMainThread(THREAD *thread, void *param)
 	}
 }
 
-// Get enabled or disabled VPN Azure client
-bool AcGetEnable(AZURE_CLIENT *ac)
-{
-	// Validate arguments
-	if (ac == NULL)
-	{
-		return false;
-	}
-
-	return ac->IsEnabled;
-}
-
 // Enable or disable VPN Azure client
 void AcSetEnable(AZURE_CLIENT *ac, bool enabled)
 {

src/Cedar/AzureClient.h

@@ -166,7 +166,6 @@ void FreeAzureClient(AZURE_CLIENT *ac);
 void AcApplyCurrentConfig(AZURE_CLIENT *ac, DDNS_CLIENT_STATUS *ddns_status);
 void AcMainThread(THREAD *thread, void *param);
 void AcSetEnable(AZURE_CLIENT *ac, bool enabled);
-bool AcGetEnable(AZURE_CLIENT *ac);
 void AcWaitForRequest(AZURE_CLIENT *ac, SOCK *s, AZURE_PARAM *param);
 
 

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);

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);

src/Cedar/Command.c

@@ -23229,7 +23229,6 @@ void CtEscapeCsv(wchar_t *dst, UINT size, wchar_t *src){
 	}
 
 	// If there is no character that need to be escaped in the input characters, copy it to the output
-	len = UniStrLen(src);
 	for (i=0; i<len; i++)
 	{
 		tmp[0] = src[i];