diff options
author | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 12:33:13 +0000 |
---|---|---|
committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 12:33:13 +0000 |
commit | 159b565b390687258ee65a3b66596e118752063c (patch) | |
tree | 91105378fcb9e030ba4a7f6572c4ea307cb8c8d6 /plugins/Variables | |
parent | 7f4d529b59698d7eb2403bd1f9088a5aa7fa9080 (diff) |
replace strcmp to mir_strcmp
git-svn-id: http://svn.miranda-ng.org/main/trunk@13752 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Variables')
-rw-r--r-- | plugins/Variables/docs/Variables.txt | 4 | ||||
-rw-r--r-- | plugins/Variables/src/contact.cpp | 12 | ||||
-rw-r--r-- | plugins/Variables/src/parse_str.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/plugins/Variables/docs/Variables.txt b/plugins/Variables/docs/Variables.txt index af25cbf0fa..2e067ee1e7 100644 --- a/plugins/Variables/docs/Variables.txt +++ b/plugins/Variables/docs/Variables.txt @@ -305,7 +305,7 @@ Generates a for-loop; w will be initialized, x specifies the condition on which y will be executed and z will be shown.
Example:
-!for(!puts(i,0),!not(!strcmp(!get(i),3)),!puts(i,!add(!get(i),1)),i=!get(i)!crlf())
+!for(!puts(i,0),!not(!mir_strcmp(!get(i),3)),!puts(i,!add(!get(i),1)),i=!get(i)!crlf())
--- Notes ---
@@ -343,7 +343,7 @@ Example: # get the number of contacts with the display name "Marley"
!puts(count,!ccount(`Marley`,display))
# loop through these contacts, for each of them, show the e-mail address
-!for(!puts(n,0),!not(!strcmp(!get(n),!get(count))),!puts(n,!add(!get(n),1)),!cinfo(!contact(`Marley`,`display`,!add(!get(n),1)),email))
+!for(!puts(n,0),!not(!mir_strcmp(!get(n),!get(count))),!puts(n,!add(!get(n),1)),!cinfo(!contact(`Marley`,`display`,!add(!get(n),1)),email))
In case the z argument is used, y can be any property of the cinfo
function. Z can be 'r' to get a random contact.
diff --git a/plugins/Variables/src/contact.cpp b/plugins/Variables/src/contact.cpp index cbb70481bc..40b0bf6f3c 100644 --- a/plugins/Variables/src/contact.cpp +++ b/plugins/Variables/src/contact.cpp @@ -369,13 +369,13 @@ static int contactSettingChanged(WPARAM hContact, LPARAM lParam) continue;
char *uid = (char*)CallProtoService(szProto,PS_GETCAPS,PFLAG_UNIQUEIDSETTING,0);
- if (((!strcmp(dbw->szSetting, "Nick")) && (cce[i].flags & CI_NICK)) ||
- ((!strcmp(dbw->szSetting, "FirstName")) && (cce[i].flags & CI_FIRSTNAME)) ||
- ((!strcmp(dbw->szSetting, "LastName")) && (cce[i].flags & CI_LASTNAME)) ||
- ((!strcmp(dbw->szSetting, "e-mail")) && (cce[i].flags & CI_EMAIL)) ||
- ((!strcmp(dbw->szSetting, "MyHandle")) && (cce[i].flags & CI_LISTNAME)) ||
+ if (((!mir_strcmp(dbw->szSetting, "Nick")) && (cce[i].flags & CI_NICK)) ||
+ ((!mir_strcmp(dbw->szSetting, "FirstName")) && (cce[i].flags & CI_FIRSTNAME)) ||
+ ((!mir_strcmp(dbw->szSetting, "LastName")) && (cce[i].flags & CI_LASTNAME)) ||
+ ((!mir_strcmp(dbw->szSetting, "e-mail")) && (cce[i].flags & CI_EMAIL)) ||
+ ((!mir_strcmp(dbw->szSetting, "MyHandle")) && (cce[i].flags & CI_LISTNAME)) ||
(cce[i].flags & CI_CNFINFO) != 0 || // lazy; always invalidate CNF info cache entries
- (( ((INT_PTR)uid != CALLSERVICE_NOTFOUND) && (uid != NULL)) && (!strcmp(dbw->szSetting, uid)) && (cce[i].flags & CI_UNIQUEID)))
+ (( ((INT_PTR)uid != CALLSERVICE_NOTFOUND) && (uid != NULL)) && (!mir_strcmp(dbw->szSetting, uid)) && (cce[i].flags & CI_UNIQUEID)))
{
/* remove from cache */
mir_free(cce[i].tszContact);
diff --git a/plugins/Variables/src/parse_str.h b/plugins/Variables/src/parse_str.h index cab3c017bc..05f14d81c2 100644 --- a/plugins/Variables/src/parse_str.h +++ b/plugins/Variables/src/parse_str.h @@ -43,7 +43,7 @@ #define MIR_STRCHR _T("strchr")
#define MIR_STRRCHR _T("strrchr")
#define MIR_STRSTR _T("strstr")
-#define MIR_STRCMP _T("strcmp")
+#define MIR_STRCMP _T("mir_strcmp")
#define MIR_STRNCMP _T("strncmp")
#define MIR_STRMCMP _T("strmcmp")
#define MIR_STRICMP _T("stricmp")
|