From c1881274c8c431014368f4f5b9b49397e6c579f0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 3 Jun 2019 14:02:02 +0300 Subject: Folders: old TCHAR helpers removed --- plugins/SecureIM/src/main.cpp | 2 +- plugins/SecureIM/src/splitmsg.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/SecureIM/src') diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp index 010a065109..fb9fcee22b 100644 --- a/plugins/SecureIM/src/main.cpp +++ b/plugins/SecureIM/src/main.cpp @@ -54,7 +54,7 @@ static int onModulesLoaded(WPARAM, LPARAM) { InitNetlib(); - g_hFolders = FoldersRegisterCustomPathT(LPGEN("SecureIM"), LPGEN("Icons"), MIRANDA_PATH "\\icons"); + g_hFolders = FoldersRegisterCustomPath(LPGEN("SecureIM"), LPGEN("Icons"), MIRANDA_PATH "\\icons"); InitIcons(); GetFlags(); diff --git a/plugins/SecureIM/src/splitmsg.cpp b/plugins/SecureIM/src/splitmsg.cpp index c44f546ffe..bb63c0ffe9 100644 --- a/plugins/SecureIM/src/splitmsg.cpp +++ b/plugins/SecureIM/src/splitmsg.cpp @@ -1,7 +1,7 @@ #include "commonheaders.h" // разбивает сообщение szMsg на части длиной iLen, возвращает строку вида PARTzPARTzz -LPSTR splitMsg(LPSTR szMsg, int iLen) +LPSTR splitMsg(LPSTR szMsg, size_t iLen) { Sent_NetLog("split: msg: -----\n%s\n-----\n", szMsg); @@ -14,7 +14,7 @@ LPSTR splitMsg(LPSTR szMsg, int iLen) size_t part_all = (len + iLen - 1) / iLen; for (size_t part_num = 0; part_numiLen) ? iLen : len; + size_t sz = (len > iLen) ? iLen : len; mir_snprintf(buf, 32, "%s%04X%02X%02X", SIG_SECP, msg_id, part_num, part_all); memcpy(buf + LEN_SECP + 8, szMsg, sz); *(buf + LEN_SECP + 8 + sz) = '\0'; -- cgit v1.2.3