From 8f363ee967527cf9b91e909cd32684a4ac5a3ce9 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Tue, 6 Apr 2010 03:23:02 +0000
Subject: More optimizations

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@500 4f64403b-2f21-0410-a795-97e2b3489a10
---
 updater/socket.cpp | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'updater/socket.cpp')

diff --git a/updater/socket.cpp b/updater/socket.cpp
index 2413f7d..94a52da 100644
--- a/updater/socket.cpp
+++ b/updater/socket.cpp
@@ -20,7 +20,7 @@ bool GetFile(char *url, TCHAR *temp_folder, char *plugin_name, char *version, bo
 	if(!CreatePath(options.temp_folder)) {
 		DWORD err = GetLastError();
 		char buff[128];
-		sprintf(buff, "GetFile: error creating temp folder, code %d", (unsigned)err);
+		mir_snprintf(buff, SIZEOF(buff), "GetFile: error creating temp folder, code %u", err);
 		NLog(buff);
 		return false;
 	}
@@ -29,7 +29,7 @@ bool GetFile(char *url, TCHAR *temp_folder, char *plugin_name, char *version, bo
 	if(options.save_zips && !CreatePath(options.zip_folder)) {
 		DWORD err = GetLastError();
 		char buff[128];
-		sprintf(buff, "GetFile: error creating zip folder, code %d", (unsigned)err);
+		mir_snprintf(buff, SIZEOF(buff), "GetFile: error creating zip folder, code %u", err);
 		NLog(buff);
 		return false;
 	}
@@ -38,7 +38,7 @@ bool GetFile(char *url, TCHAR *temp_folder, char *plugin_name, char *version, bo
 	_tcscat(save_file, _T("\\"));
 	TCHAR *temp_str = GetTString(plugin_name);
 	_tcscat(save_file, temp_str);
-	free(temp_str);
+	mir_free(temp_str);
 	if(version) {
 		temp_str = GetTString(version);
 		_tcscat(save_file, _T("_"));
@@ -116,11 +116,11 @@ bool GetFile(char *url, TCHAR *temp_folder, char *plugin_name, char *version, bo
 							DeleteFile(save_archive);
 							if(!MoveFile(save_file, save_archive)) {
 								char buff[128];
-								sprintf(buff, "GetFile: could not move file, code: %d", (unsigned)GetLastError());
+								mir_snprintf(buff, SIZEOF(buff), "GetFile: could not move file, code: %u", GetLastError());
 								NLog(buff);
 								if(!DeleteFile(save_file)) {
 									char buff[128];
-									sprintf(buff, "GetFile: error deleting file, code: %d", (unsigned)GetLastError());
+									mir_snprintf(buff, SIZEOF(buff), "GetFile: error deleting file, code: %u", GetLastError());
 									NLog(buff);
 								}
 							}
@@ -128,7 +128,7 @@ bool GetFile(char *url, TCHAR *temp_folder, char *plugin_name, char *version, bo
 						} else {
 							if(!DeleteFile(save_file)) {
 								char buff[128];
-								sprintf(buff, "GetFile: error deleting file, code: %d", (unsigned)GetLastError());
+								mir_snprintf(buff, SIZEOF(buff), "GetFile: error deleting file, code: %u", GetLastError());
 								NLog(buff);
 							}
 						}
@@ -143,13 +143,13 @@ bool GetFile(char *url, TCHAR *temp_folder, char *plugin_name, char *version, bo
 
 				} else {
 					char buff[128];
-					sprintf(buff, "GetFile: error writing file, code %d", (unsigned)GetLastError());
+					mir_snprintf(buff, SIZEOF(buff), "GetFile: error writing file, code %u", GetLastError());
 					NLog(buff);
 				}
 				CloseHandle(hSaveFile);
 			} else {
 				char buff[128];
-				sprintf(buff, "GetFile: error creating file, code %d", (unsigned)GetLastError());
+				mir_snprintf(buff, SIZEOF(buff), "GetFile: error creating file, code %u", GetLastError());
 				NLog(buff);
 			}
 		} else if(resp->resultCode >= 300 && resp->resultCode < 400) {
@@ -170,9 +170,7 @@ bool GetFile(char *url, TCHAR *temp_folder, char *plugin_name, char *version, bo
 			mir_sntprintf(buff, SIZEOF(buff), TranslateT("Failed to download \"%s\" - Invalid response, code %d"), plugin_name, resp->resultCode);
 
 			ShowError(buff);
-			char *ts = mir_t2a(buff);
-			NLog(ts);
-			mir_free(ts);
+			NLog(buff);
 
 		}
 		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)resp);
@@ -186,9 +184,7 @@ bool GetFile(char *url, TCHAR *temp_folder, char *plugin_name, char *version, bo
 			FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, 0, err, 0, buff + len, 512 - len, 0);
 
 			ShowError(buff);
-			char *ts = mir_t2a(buff);
-			NLog(ts);
-			mir_free(ts);
+			NLog(buff);
 		}
 	}
 
-- 
cgit v1.2.3