From 159b565b390687258ee65a3b66596e118752063c Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 12:33:13 +0000 Subject: replace strcmp to mir_strcmp git-svn-id: http://svn.miranda-ng.org/main/trunk@13752 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Non-IM Contact/src/contactinfo.cpp | 6 +++--- plugins/Non-IM Contact/src/dialog.cpp | 2 +- plugins/Non-IM Contact/src/main.cpp | 4 ++-- plugins/Non-IM Contact/src/namereplacing.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/Non-IM Contact') diff --git a/plugins/Non-IM Contact/src/contactinfo.cpp b/plugins/Non-IM Contact/src/contactinfo.cpp index f6d23ee084..24703b4c93 100644 --- a/plugins/Non-IM Contact/src/contactinfo.cpp +++ b/plugins/Non-IM Contact/src/contactinfo.cpp @@ -494,9 +494,9 @@ INT_PTR ImportContacts(WPARAM wParam, LPARAM lParam) return 1; while (fgets(line, 2000, file)) { - if (!strcmp(line, "\r\n\0")) + if (!mir_strcmp(line, "\r\n\0")) continue; - if (!strcmp(line, "[Non-IM Contact]\r\n")) + if (!mir_strcmp(line, "[Non-IM Contact]\r\n")) contactDone = 0; else if (!strncmp(line, "Name=", mir_strlen("Name="))) { i = (int)mir_strlen("Name="); j = 0; @@ -554,7 +554,7 @@ INT_PTR ImportContacts(WPARAM wParam, LPARAM lParam) i = (int)mir_strlen("Minutes="); sscanf(&line[i], "%d", &minutes); } - else if (contactDone && !strcmp(line, "[/Non-IM Contact]\r\n")) { + else if (contactDone && !mir_strcmp(line, "[/Non-IM Contact]\r\n")) { if (!name) continue; size_t size = mir_strlen(name) + mir_strlen("Do you want to import this Non-IM Contact?\r\n\r\nName: \r\n") + 1; char *msg = (char*)malloc(size); diff --git a/plugins/Non-IM Contact/src/dialog.cpp b/plugins/Non-IM Contact/src/dialog.cpp index d41cb61fed..9e6fb07c4d 100644 --- a/plugins/Non-IM Contact/src/dialog.cpp +++ b/plugins/Non-IM Contact/src/dialog.cpp @@ -139,7 +139,7 @@ INT_PTR CALLBACK TestWindowDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP GetDlgItemTextA(hwnd, IDC_STRING, tmp, SIZEOF(tmp)); if (tmp[mir_strlen(tmp) - 1] == '(') { for (i = 0; i < VARS; i++) { - if (!strcmp(braceList[i].var, &tmp[mir_strlen(tmp) - mir_strlen(braceList[i].var)])) { + if (!mir_strcmp(braceList[i].var, &tmp[mir_strlen(tmp) - mir_strlen(braceList[i].var)])) { for (j = 0; j < MAX_BRACES; j++) { if (!braceOrder[j]) { braceOrder[j] = i; diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp index 6c8df00ec8..3956f03fe1 100644 --- a/plugins/Non-IM Contact/src/main.cpp +++ b/plugins/Non-IM Contact/src/main.cpp @@ -29,10 +29,10 @@ INT_PTR doubleClick(WPARAM wParam, LPARAM lParam) char program[MAX_PATH], params[MAX_PATH]; int shellEXEerror = 0; char* proto = GetContactProto(wParam); - if (proto && !strcmp(proto, MODNAME)) { + if (proto && !mir_strcmp(proto, MODNAME)) { if (GetKeyState(VK_CONTROL) & 0x8000) // ctrl is pressed editContact(wParam, 0); // for later when i add a second double click setting - else if (db_get_static(wParam, MODNAME, "Program", program, SIZEOF(program)) && strcmp(program, "")) { + else if (db_get_static(wParam, MODNAME, "Program", program, SIZEOF(program)) && mir_strcmp(program, "")) { if (!db_get_static(wParam, MODNAME, "ProgramParams", params, SIZEOF(params))) strcpy(params, ""); if (strstr(program, "http://") || strstr(program, "https://")) diff --git a/plugins/Non-IM Contact/src/namereplacing.cpp b/plugins/Non-IM Contact/src/namereplacing.cpp index edfa7dd539..091b9e3718 100644 --- a/plugins/Non-IM Contact/src/namereplacing.cpp +++ b/plugins/Non-IM Contact/src/namereplacing.cpp @@ -219,7 +219,7 @@ void checkStringForcompare(char *str) Y = strtok(NULL, ",\")"); j = Y - ©OfStr[i] + (int)mir_strlen(Y) + 1; if (A && B && X && Y) { - if (!strcmp(A, B)) + if (!mir_strcmp(A, B)) strcat(newStr, X); else strcat(newStr, Y); } @@ -613,7 +613,7 @@ void WriteSetting(MCONTACT hContact, char* module1, char* setting1, char* module break; } // strip the tab and new lines from all except the tooltip - if (!error && strcmp(setting1, "ToolTip")) stripWhiteSpace(newString); + if (!error && mir_strcmp(setting1, "ToolTip")) stripWhiteSpace(newString); db_set_s(hContact, module2, setting2, newString); } else db_set_s(hContact, module2, setting2, ""); -- cgit v1.2.3