From a15cd68f0412e1b211e746a2e4d5682e96f5a113 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 11 Aug 2015 13:52:01 +0000
Subject: code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@14911 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/CryptoPP/src/GPGw/gpg_main.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'plugins/CryptoPP/src/GPGw/gpg_main.cpp')

diff --git a/plugins/CryptoPP/src/GPGw/gpg_main.cpp b/plugins/CryptoPP/src/GPGw/gpg_main.cpp
index fc544ffa52..5bbbc9f5e3 100644
--- a/plugins/CryptoPP/src/GPGw/gpg_main.cpp
+++ b/plugins/CryptoPP/src/GPGw/gpg_main.cpp
@@ -163,7 +163,6 @@ LPSTR __cdecl _gpg_encrypt(LPCSTR message, LPCSTR keyid)
 {
 	char buffer[ciphertextsize];
 	char *encmessage = 0;
-	int encmessagelen;
 	gpgResult gpgresult;
 
 	if(strlen(keyid))
@@ -174,7 +173,7 @@ LPSTR __cdecl _gpg_encrypt(LPCSTR message, LPCSTR keyid)
 		if(gpgresult!=gpgSuccess)
 			return 0;
 
-		encmessagelen = strlen(buffer)+1;
+		size_t encmessagelen = strlen(buffer)+1;
 		encmessage = (char *) LocalAlloc(LPTR,encmessagelen);
 		memcpy(encmessage, buffer, encmessagelen);
 	}
@@ -192,7 +191,6 @@ LPSTR __cdecl _gpg_decrypt(LPCSTR message)
 	char *storedpassphrase;
 	char passphrase[passphrasesize];
 	char *decmessage = 0;
-	int decmessagelen;
 	gpgResult gpgresult;
 
 	const char *begin = strstr(message, txtbeginpgpmessage);
@@ -254,7 +252,7 @@ LPSTR __cdecl _gpg_decrypt(LPCSTR message)
 
 		memset(passphrase, 0, sizeof(passphrase));
 
-		decmessagelen = strlen(buffer)+1;
+		size_t decmessagelen = strlen(buffer)+1;
 		decmessage = (char *) LocalAlloc(LPTR,decmessagelen);
 		memcpy(decmessage, buffer, decmessagelen);
 	}
@@ -356,7 +354,6 @@ BOOL ShowSelectExecDlg(LPSTR path)
 
 BOOL ShowSelectHomeDlg(LPSTR path)
 {
-	int i;
 	OPENFILENAME ofn;
 
 	ofn.lpstrFile = GetEnvValue("GNUPGHOME");
@@ -387,7 +384,8 @@ BOOL ShowSelectHomeDlg(LPSTR path)
 	ofn.lpstrTitle = "Open Public Keyring";
 	if (!GetOpenFileName(&ofn)) return FALSE;
 
-	for(i=strlen(path);i && path[i]!='\\';i--);
+	int i;
+	for(i = (int)strlen(path);i && path[i]!='\\';i--);
 	path[i] = 0;
 
 	return TRUE;
-- 
cgit v1.2.3