code cleaning for old shitty helper

2 files changed, 8 insertions, 66 deletions

diff --git a/plugins/helpers/gen_helpers.cpp b/plugins/helpers/gen_helpers.cpp
index 9dd8b0fffe..3bf6e4976f 100644
--- a/plugins/helpers/gen_helpers.cpp
+++ b/plugins/helpers/gen_helpers.cpp
@@ -53,55 +53,7 @@ wchar_t* Hlp_GetWindowText(HWND hwndDlg)
 	return res;

 }

 

-/**

- * Modified from Miranda CList, clistsettings.c

- **/

-

- // Logging

-static int WriteToDebugLogA(const char *szMsg)

-{

-	return Netlib_Log(nullptr, szMsg);

-}

-

-int AddDebugLogMessageA(const char* fmt, ...)

-{

-	char szText[MAX_DEBUG], szFinal[MAX_DEBUG];

-

-	va_list va;

-	va_start(va, fmt);

-	mir_vsnprintf(szText, _countof(szText), fmt, va);

-	va_end(va);

-#ifdef MODULENAME

-	mir_snprintf(szFinal, "%s: %s", MODULENAME, szText);

-#else

-	strncpy(szFinal, szText, _countof(szFinal));

-#endif

-	return WriteToDebugLogA(szFinal);

-}

-

-int AddDebugLogMessage(const wchar_t* fmt, ...)

-{

-	wchar_t tszText[MAX_DEBUG], tszFinal[MAX_DEBUG];

-

-	va_list va;

-	va_start(va, fmt);

-	mir_vsnwprintf(tszText, _countof(tszText), fmt, va);

-	va_end(va);

-#ifdef MODULENAME

-	mir_snwprintf(tszFinal, L"%s: %s", MODULENAME, tszText);

-#else

-	wcsncpy(tszFinal, tszText, _countof(tszFinal));

-#endif

-

-	return WriteToDebugLogA(_T2A(tszFinal));

-}

-

-int ttoi(wchar_t *string)

-{

-	return (string == nullptr) ? 0 : _wtoi(string);

-}

-

-wchar_t *itot(int num)

+wchar_t* _itow(int num)

 {

 	wchar_t tRes[32];

 	// check this

diff --git a/plugins/helpers/gen_helpers.h b/plugins/helpers/gen_helpers.h
index f084929244..2cb4901829 100644
--- a/plugins/helpers/gen_helpers.h
+++ b/plugins/helpers/gen_helpers.h
@@ -19,12 +19,9 @@
 #ifndef __GEN_HELPERS_H

 #define __GEN_HELPERS_H

 

-TCHAR *Hlp_GetProtocolName(const char *proto);

-TCHAR *Hlp_GetDlgItemText(HWND hwndDlg, int nIDDlgItem);

-TCHAR *Hlp_GetWindowText(HWND hwndDlg);

-

-int ttoi(TCHAR *string);

-TCHAR *itot(int num);

+TCHAR* Hlp_GetProtocolName(const char *proto);

+TCHAR* Hlp_GetDlgItemText(HWND hwndDlg, int nIDDlgItem);

+TCHAR* Hlp_GetWindowText(HWND hwndDlg);

 

 #define MAX_DEBUG	1024

 

@@ -39,23 +36,16 @@ TCHAR *itot(int num);
  #endif

 #endif

 

-int AddDebugLogMessageA(const char* fmt, ...);

-int AddDebugLogMessage(const TCHAR* fmt, ...);

-

 #if LOGLEVEL >= __LOGLEVEL_DEBUG

-#define log_debugA AddDebugLogMessageA

-#define log_debug AddDebugLogMessage

+#define log_debug Netlib_Logf

 #else

-static __inline int log_debugA(const char*, ...) { return 0; }

-static __inline int log_debug(const TCHAR*, ...) { return 0; }

+static __inline int log_debug(int, const char*, ...) { return 0; }

 #endif

 

 #if LOGLEVEL >= __LOGLEVEL_INFO

-#define log_infoA AddDebugLogMessageA

-#define log_info AddDebugLogMessage

+#define log_info Netlib_Logf

 #else

-static __inline int log_infoA(const char*, ...) { return 0; }

-static __inline int log_info(const TCHAR*, ...) { return 0; }

+static __inline int log_info(int, const char*, ...) { return 0; }

 #endif

 

 #endif