From 2f261839b60692e33d0e160344d0d636d49c90ba Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Jul 2016 14:23:31 +0000 Subject: less TCHARs git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AutoShutdown/src/utils.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/AutoShutdown/src/utils.cpp') diff --git a/plugins/AutoShutdown/src/utils.cpp b/plugins/AutoShutdown/src/utils.cpp index ffe41e4a0a..c6724ab982 100644 --- a/plugins/AutoShutdown/src/utils.cpp +++ b/plugins/AutoShutdown/src/utils.cpp @@ -52,7 +52,7 @@ void TrimString(wchar_t *pszStr) wchar_t *psz, szChars[] = L" \r\n\t"; for (int i = 0; i < _countof(szChars); ++i) { /* trim end */ - psz = &pszStr[mir_tstrlen(pszStr) - 1]; + psz = &pszStr[mir_wstrlen(pszStr) - 1]; while (pszStr[0] && *psz == szChars[i]) { *psz = 0; psz = CharPrev(pszStr, psz); @@ -60,7 +60,7 @@ void TrimString(wchar_t *pszStr) /* trim beginning */ for (psz = pszStr; (*psz && *psz == szChars[i]); psz = CharNext(psz)) ; - memmove(pszStr, psz, (mir_tstrlen(psz) + 1)*sizeof(wchar_t)); + memmove(pszStr, psz, (mir_wstrlen(psz) + 1)*sizeof(wchar_t)); } } @@ -199,7 +199,7 @@ BOOL GetFormatedDateTime(wchar_t *pszOut, int nSize, time_t timestamp, BOOL fSho return FALSE; if (!GetDateFormat(locale, DATE_SHORTDATE, &st, NULL, szDate, _countof(szDate))) return FALSE; - mir_sntprintf(pszOut, nSize, L"%s %s", szTime, szDate); + mir_snwprintf(pszOut, nSize, L"%s %s", szTime, szDate); return TRUE; } } -- cgit v1.2.3