From 5a17c9299e03bebf46169927abdeee34aaf8e854 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 10:06:32 +0000 Subject: replace strlen to mir_strlen git-svn-id: http://svn.miranda-ng.org/main/trunk@13747 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- .../StatusPlugins/AdvancedAutoAway/msgoptions.cpp | 2 +- plugins/StatusPlugins/KeepStatus/keepstatus.cpp | 2 +- plugins/StatusPlugins/StartupStatus/options.cpp | 24 +++++++++++----------- .../StatusPlugins/StartupStatus/startupstatus.cpp | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'plugins/StatusPlugins') diff --git a/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp b/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp index f97af44c44..24fdfe117a 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp @@ -78,7 +78,7 @@ INT_PTR CALLBACK DlgProcAutoAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L DBVARIANT dbv; if ( !db_get(NULL, MODULENAME, StatusModeToDbSetting(statusModeList[i],SETTING_STATUSMSG), &dbv)) { - settings[count]->msg = ( char* )malloc(strlen(dbv.pszVal) + 1); + settings[count]->msg = ( char* )malloc(mir_strlen(dbv.pszVal) + 1); strcpy(settings[count]->msg, dbv.pszVal); db_free(&dbv); } diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp index 10f36e80da..8551cf26fa 100644 --- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp +++ b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp @@ -931,7 +931,7 @@ static int ProcessPopup(int reason, LPARAM lParam) memset(protoInfo, '\0', sizeof(protoInfo)); _tcscpy(protoInfo, _T("\r\n")); for (int i = 0; i < connectionSettings.getCount(); i++) { - if (_tcslen(ps[i]->tszAccName) > 0 && strlen(ps[i]->szName) > 0) { + if (_tcslen(ps[i]->tszAccName) > 0 && mir_strlen(ps[i]->szName) > 0) { if (db_get_b(NULL, MODULENAME, SETTING_PUSHOWEXTRA, TRUE)) { mir_sntprintf(protoInfoLine, SIZEOF(protoInfoLine), TranslateT("%s\t(will be set to %s)\r\n"), ps[i]->tszAccName, pcli->pfnGetStatusModeDescription(ps[i]->status, GSMDF_TCHAR)); _tcsncat(protoInfo, protoInfoLine, SIZEOF(protoInfo) - _tcslen(protoInfo) - 1); diff --git a/plugins/StatusPlugins/StartupStatus/options.cpp b/plugins/StatusPlugins/StartupStatus/options.cpp index 159bb8182c..19200e5f9d 100644 --- a/plugins/StatusPlugins/StartupStatus/options.cpp +++ b/plugins/StatusPlugins/StartupStatus/options.cpp @@ -79,27 +79,27 @@ static char* GetCMDLArguments(TSettingsList& protoSettings) return NULL; char *cmdl, *pnt; - pnt = cmdl = ( char* )malloc(strlen(protoSettings[0].szName) + strlen(GetStatusDesc(protoSettings[0].status)) + 4); + pnt = cmdl = ( char* )malloc(mir_strlen(protoSettings[0].szName) + mir_strlen(GetStatusDesc(protoSettings[0].status)) + 4); for (int i=0; i < protoSettings.getCount(); i++ ) { *pnt++ = '/'; strcpy(pnt, protoSettings[i].szName); - pnt += strlen(protoSettings[i].szName); + pnt += mir_strlen(protoSettings[i].szName); *pnt++ = '='; strcpy(pnt, GetStatusDesc(protoSettings[i].status)); - pnt += strlen(GetStatusDesc(protoSettings[i].status)); + pnt += mir_strlen(GetStatusDesc(protoSettings[i].status)); if (i != protoSettings.getCount()-1) { *pnt++ = ' '; *pnt++ = '\0'; - cmdl = ( char* )realloc(cmdl, strlen(cmdl) + strlen(protoSettings[i+1].szName) + strlen(GetStatusDesc(protoSettings[i+1].status)) + 4); - pnt = cmdl + strlen(cmdl); + cmdl = ( char* )realloc(cmdl, mir_strlen(cmdl) + mir_strlen(protoSettings[i+1].szName) + mir_strlen(GetStatusDesc(protoSettings[i+1].status)) + 4); + pnt = cmdl + mir_strlen(cmdl); } } if ( db_get_b( NULL, MODULENAME, SETTING_SHOWDIALOG, FALSE ) == TRUE ) { *pnt++ = ' '; *pnt++ = '\0'; - cmdl = ( char* )realloc(cmdl, strlen(cmdl) + 12); - pnt = cmdl + strlen(cmdl); + cmdl = ( char* )realloc(cmdl, mir_strlen(cmdl) + 12); + pnt = cmdl + mir_strlen(cmdl); strcpy(pnt, "/showdialog"); pnt += 11; *pnt = '\0'; @@ -113,12 +113,12 @@ static char* GetCMDL(TSettingsList& protoSettings) char path[MAX_PATH]; GetModuleFileNameA(NULL, path, MAX_PATH); - char* cmdl = ( char* )malloc(strlen(path) + 4); - mir_snprintf(cmdl, strlen(path) + 4, "\"%s\" ", path); + char* cmdl = ( char* )malloc(mir_strlen(path) + 4); + mir_snprintf(cmdl, mir_strlen(path) + 4, "\"%s\" ", path); char* args = GetCMDLArguments(protoSettings); if ( args ) { - cmdl = ( char* )realloc(cmdl, strlen(cmdl) + strlen(args) + 1); + cmdl = ( char* )realloc(cmdl, mir_strlen(cmdl) + mir_strlen(args) + 1); strcat(cmdl, args); free(args); } @@ -924,7 +924,7 @@ static int ClearDatabase(char* filter) dbces.pfnEnumProc = DeleteSetting; CallService(MS_DB_CONTACT_ENUMSETTINGS,0,(LPARAM)&dbces); for (i=0; i < settingCount; i++) { - if ((filter == NULL) || (!strncmp(filter, settings[i], strlen(filter)))) + if ((filter == NULL) || (!strncmp(filter, settings[i], mir_strlen(filter)))) db_unset(NULL, MODULENAME, settings[i]); free(settings[i]); } @@ -945,7 +945,7 @@ static int CountSettings(const char *szSetting,LPARAM lParam) static int DeleteSetting(const char *szSetting,LPARAM lParam) { char** settings = (char**)*(char ***)lParam; - settings[settingIndex] = ( char* )malloc(strlen(szSetting)+1); + settings[settingIndex] = ( char* )malloc(mir_strlen(szSetting)+1); strcpy(settings[settingIndex], szSetting); settingIndex += 1; diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp index 2c2e8c9343..845c8c30b2 100644 --- a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp +++ b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp @@ -84,7 +84,7 @@ static BYTE showDialogOnStartup = 0; static PROTOCOLSETTINGEX* IsValidProtocol(TSettingsList& protoSettings, char* protoName) { for (int i = 0; i < protoSettings.getCount(); i++) - if (!strncmp(protoSettings[i].szName, protoName, strlen(protoSettings[i].szName))) + if (!strncmp(protoSettings[i].szName, protoName, mir_strlen(protoSettings[i].szName))) return &protoSettings[i]; return NULL; -- cgit v1.2.3