From 2ec5040dda86f76532d48302fede21866916954a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Wed, 28 Oct 2015 08:32:01 +0000 Subject: Optimize ME_DB_CONTACT_SETTINGCHANGED functions to not use mir_strcmp() but just strcmp() (and similar methods) It's not needed to user mir_* for checking null pointers when we're comparing const strings with DBCONTACTWRITESETTING values which should be always initialized correctly. Somewhere also changed strcmpi to just strcmp, because these settings are case-sensitive anyway. git-svn-id: http://svn.miranda-ng.org/main/trunk@15631 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/FloatingContacts/src/main.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/FloatingContacts/src/main.cpp') diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index 4bee59b187..b95dccd0ab 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -229,7 +229,7 @@ static int OnContactSettingChanged(WPARAM hContact, LPARAM lParam) DBCONTACTWRITESETTING *pdbcws = (DBCONTACTWRITESETTING*)lParam; if (hContact == NULL) { - if ((0 == _stricmp(pdbcws->szModule, "CLC")) || (0 == _stricmp(pdbcws->szModule, MODULE))) { + if ((0 == strcmp(pdbcws->szModule, "CLC")) || (0 == strcmp(pdbcws->szModule, MODULE))) { LoadDBSettings(); ApplyOptionsChanges(); } @@ -241,15 +241,15 @@ static int OnContactSettingChanged(WPARAM hContact, LPARAM lParam) return 0; // Only on these 2 events we need to refresh - if (0 == _stricmp(pdbcws->szSetting, "Status")) + if (0 == strcmp(pdbcws->szSetting, "Status")) idStatus = pdbcws->value.wVal; - else if (0 == _stricmp(pdbcws->szSetting, "ApparentMode")) + else if (0 == strcmp(pdbcws->szSetting, "ApparentMode")) idStatus = GetContactStatus(hContact); - else if (0 == _stricmp(pdbcws->szSetting, "Nick")) + else if (0 == strcmp(pdbcws->szSetting, "Nick")) idStatus = GetContactStatus(hContact); - else if (0 == _stricmp(pdbcws->szSetting, "MyHandle")) + else if (0 == strcmp(pdbcws->szSetting, "MyHandle")) idStatus = GetContactStatus(hContact); - else if (fcOpt.bShowIdle && 0 == _stricmp(pdbcws->szSetting, "IdleTS")) + else if (fcOpt.bShowIdle && 0 == strcmp(pdbcws->szSetting, "IdleTS")) idStatus = GetContactStatus(hContact); else bRefresh = FALSE; -- cgit v1.2.3