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/common.h | 8 +++++--- updater/extern.cpp | 2 +- updater/socket.cpp | 24 ++++++++++-------------- updater/utils.cpp | 24 ++++++++++++++++++------ updater/xmldata.cpp | 9 ++------- 5 files changed, 36 insertions(+), 31 deletions(-) diff --git a/updater/common.h b/updater/common.h index d454179..45519a9 100644 --- a/updater/common.h +++ b/updater/common.h @@ -108,9 +108,11 @@ extern bool is_idle; extern HANDLE hNetlibUser, hNetlibHttp; -static int __inline NLog(char *msg) { - return CallService(MS_NETLIB_LOG, (WPARAM)hNetlibUser, (LPARAM)msg); -} +void NLog(char *msg); + +#ifdef _UNICODE +void NLog(wchar_t *msg); +#endif // clist 'exit' menu item command id #define ID_ICQ_EXIT 40001 diff --git a/updater/extern.cpp b/updater/extern.cpp index 629d1eb..ccd7fcf 100644 --- a/updater/extern.cpp +++ b/updater/extern.cpp @@ -12,7 +12,7 @@ int ExternProcess(bool restart) { // -- restart miranda char msg[1024]; - mir_snprintf(msg, 1024, "spawning external process, restart = %s", restart ? "true" : "false"); + mir_snprintf(msg, SIZEOF(msg), "spawning external process, restart = %s", restart ? "true" : "false"); NLog(msg); TCHAR data_filename[MAX_PATH]; 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); } } diff --git a/updater/utils.cpp b/updater/utils.cpp index e1ffdea..6e1afad 100644 --- a/updater/utils.cpp +++ b/updater/utils.cpp @@ -118,9 +118,8 @@ bool DeleteNonDlls(const TCHAR *folder) TCHAR szFilesPath[MAX_PATH]; { - char buff[200], *ts; - mir_snprintf(buff, SIZEOF(buff), "Deleting non-dlls in %s", (ts = mir_t2a(folder))); - mir_free(ts); + TCHAR buff[200]; + mir_sntprintf(buff, SIZEOF(buff), _T("Deleting non-dlls in %s"), folder); NLog(buff); } @@ -140,9 +139,8 @@ bool DeleteNonDlls(const TCHAR *folder) if (_tcsstr(findData.cFileName, _T(".dll")) == 0) { { - char buff[200], *ts; - mir_snprintf(buff, SIZEOF(buff), "Deleting %s", (ts = mir_t2a(folder))); - mir_free(ts); + TCHAR buff[200]; + mir_sntprintf(buff, SIZEOF(buff), _T("Deleting %s"), folder); NLog(buff); } DeleteFile(szFilesPath); @@ -155,3 +153,17 @@ bool DeleteNonDlls(const TCHAR *folder) return true; } + +void NLog(char *msg) +{ + CallService(MS_NETLIB_LOG, (WPARAM)hNetlibUser, (LPARAM)msg); +} + +#ifdef _UNICODE +void NLog(wchar_t *msg) +{ + char* a = mir_u2a(msg); + CallService(MS_NETLIB_LOG, (WPARAM)hNetlibUser, (LPARAM)a); + mir_free(a); +} +#endif \ No newline at end of file diff --git a/updater/xmldata.cpp b/updater/xmldata.cpp index c124118..55cebf1 100644 --- a/updater/xmldata.cpp +++ b/updater/xmldata.cpp @@ -273,9 +273,7 @@ bool UpdateXMLData(const Category cat, const char *redirect_url /*= 0*/, int rec FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, 0, err, 0, buff + len, 512 - len, 0); ShowError(buff); //MessageBox(0, buff + len, TranslateT("Updater: Error Downloading XML Data"), MB_OK | MB_ICONWARNING); - char *ts = mir_t2a(buff); - NLog(ts); - mir_free(ts); + NLog(buff); } else { ShowError(TranslateT("Failed to download XML data - Response is NULL")); //MessageBox(0, TranslateT("Error downloading XML data...\nResponse is NULL"), Translate("Updater Error"), MB_OK | MB_ICONWARNING); @@ -315,10 +313,7 @@ bool UpdateXMLData(const Category cat, const char *redirect_url /*= 0*/, int rec TCHAR buff[512]; mir_sntprintf(buff, SIZEOF(buff), TranslateT("Failed to download XML data - Invalid response, code %d"), resp->resultCode); ShowError(buff); - - char *ts = mir_t2a(buff); - NLog(ts); - mir_free(ts); + NLog(buff); CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)resp); resp = 0; return LoadOldXMLData(cat, false); -- cgit v1.2.3