summaryrefslogtreecommitdiff
path: root/plugins/MirOTR
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2015-05-22 12:33:13 +0000
committerKirill Volinsky <mataes2007@gmail.com>2015-05-22 12:33:13 +0000
commit159b565b390687258ee65a3b66596e118752063c (patch)
tree91105378fcb9e030ba4a7f6572c4ea307cb8c8d6 /plugins/MirOTR
parent7f4d529b59698d7eb2403bd1f9088a5aa7fa9080 (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/MirOTR')
-rw-r--r--plugins/MirOTR/src/dbfilter.cpp6
-rw-r--r--plugins/MirOTR/src/options.cpp4
-rw-r--r--plugins/MirOTR/src/otr.cpp2
-rw-r--r--plugins/MirOTR/src/svcs_menu.cpp2
-rw-r--r--plugins/MirOTR/src/svcs_proto.cpp4
-rw-r--r--plugins/MirOTR/src/svcs_srmm.cpp4
-rw-r--r--plugins/MirOTR/src/utils.cpp4
7 files changed, 13 insertions, 13 deletions
diff --git a/plugins/MirOTR/src/dbfilter.cpp b/plugins/MirOTR/src/dbfilter.cpp
index 676de8c404..fa65dd8ddc 100644
--- a/plugins/MirOTR/src/dbfilter.cpp
+++ b/plugins/MirOTR/src/dbfilter.cpp
@@ -60,7 +60,7 @@ int OnDatabaseEventPreAdd(WPARAM hContact, LPARAM lParam)
if (db_get_b(hContact, proto, "ChatRoom", 0) == 1)
return 0;
- if(strcmp(proto, META_PROTO) == 0) {
+ if(mir_strcmp(proto, META_PROTO) == 0) {
hContact = db_mc_getMostOnline(hContact);
if (!hContact) return 0;
proto = GetContactProto(hContact);
@@ -278,7 +278,7 @@ int StatusModeChange(WPARAM wParam, LPARAM lParam) {
ConnContext *context = otr_user_state->context_root;
while(context) {
- if(context->msgstate == OTRL_MSGSTATE_ENCRYPTED && (proto == 0 || strcmp(proto, context->protocol) == 0)) {
+ if(context->msgstate == OTRL_MSGSTATE_ENCRYPTED && (proto == 0 || mir_strcmp(proto, context->protocol) == 0)) {
hContact = (MCONTACT)context->app_data;
if(hContact) {
@@ -298,7 +298,7 @@ int OnContactSettingChanged(WPARAM hContact, LPARAM lParam)
if (!options.end_offline)
return 0;
DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING *)lParam;
- if (!lParam || strcmp(cws->szSetting, "Status") != 0) return 0;
+ if (!lParam || mir_strcmp(cws->szSetting, "Status") != 0) return 0;
int status=0;
switch (cws->value.type){
case DBVT_WORD:
diff --git a/plugins/MirOTR/src/options.cpp b/plugins/MirOTR/src/options.cpp
index 6345502f7c..72b5d0d023 100644
--- a/plugins/MirOTR/src/options.cpp
+++ b/plugins/MirOTR/src/options.cpp
@@ -322,7 +322,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsProto(HWND hwndDlg, UINT msg, WPARAM wP
PROTOACCOUNT **pppDesc;
ProtoEnumAccounts(&num_protocols, &pppDesc);
for (int i = 0; i < num_protocols; i++) {
- if (!strcmp(pppDesc[i]->szModuleName, META_PROTO))
+ if (!mir_strcmp(pppDesc[i]->szModuleName, META_PROTO))
continue;
if ((CallProtoService(pppDesc[i]->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM) == 0)
continue;
@@ -504,7 +504,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsContacts(HWND hwndDlg, UINT msg, WPARAM
for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
const char *proto = GetContactProto(hContact);
if (proto && db_get_b(hContact, proto, "ChatRoom", 0) == 0 && CallService(MS_PROTO_ISPROTOONCONTACT, hContact, (LPARAM)MODULENAME) // ignore chatrooms
- && strcmp(proto, META_PROTO) != 0) // and MetaContacts
+ && mir_strcmp(proto, META_PROTO) != 0) // and MetaContacts
{
lvI.iItem = 0;
lvI.iSubItem = 0;
diff --git a/plugins/MirOTR/src/otr.cpp b/plugins/MirOTR/src/otr.cpp
index 8c185d99af..2bccd99338 100644
--- a/plugins/MirOTR/src/otr.cpp
+++ b/plugins/MirOTR/src/otr.cpp
@@ -249,7 +249,7 @@ extern "C" {
proto = GetContactProto((MCONTACT)opdata);
// ugly wokaround for ICQ. ICQ protocol reports more than 7k, but in SMP this is too long.
// possibly ICQ doesn't allow single words without spaces to become longer than ~2340?
- if (strcmp("ICQ", proto) == 0 || strncmp("ICQ_", proto, 4) == 0)
+ if (mir_strcmp("ICQ", proto) == 0 || strncmp("ICQ_", proto, 4) == 0)
return 2340;
return CallProtoService(proto, PS_GETCAPS, PFLAG_MAXLENOFMESSAGE, (LPARAM)opdata);
}
diff --git a/plugins/MirOTR/src/svcs_menu.cpp b/plugins/MirOTR/src/svcs_menu.cpp
index ff963c9dd1..17a3b589ae 100644
--- a/plugins/MirOTR/src/svcs_menu.cpp
+++ b/plugins/MirOTR/src/svcs_menu.cpp
@@ -192,7 +192,7 @@ hide_all:
return 0;
}
- if(proto && strcmp(proto, META_PROTO) == 0) {
+ if(proto && mir_strcmp(proto, META_PROTO) == 0) {
// make menu act as per most online subcontact
hContact = db_mc_getMostOnline(hContact);
if (!hContact)
diff --git a/plugins/MirOTR/src/svcs_proto.cpp b/plugins/MirOTR/src/svcs_proto.cpp
index dcce57fc22..b3dc9f4269 100644
--- a/plugins/MirOTR/src/svcs_proto.cpp
+++ b/plugins/MirOTR/src/svcs_proto.cpp
@@ -14,7 +14,7 @@ INT_PTR SVC_OTRSendMessage(WPARAM wParam,LPARAM lParam){
return CallService(MS_PROTO_CHAINSEND, wParam, lParam);
char *proto = GetContactProto(ccs->hContact);
- if(proto && strcmp(proto, META_PROTO) == 0) // bypass for metacontacts
+ if(proto && mir_strcmp(proto, META_PROTO) == 0) // bypass for metacontacts
return CallService(MS_PROTO_CHAINSEND, wParam, lParam);
if (!proto || !ccs->hContact)
@@ -89,7 +89,7 @@ INT_PTR SVC_OTRRecvMessage(WPARAM wParam,LPARAM lParam)
char *proto = GetContactProto(ccs->hContact);
if (!proto || !ccs->hContact)
return 1; //error
- else if(proto && strcmp(proto, META_PROTO) == 0) // bypass for metacontacts
+ else if(proto && mir_strcmp(proto, META_PROTO) == 0) // bypass for metacontacts
return CallService(MS_PROTO_CHAINRECV, wParam, lParam);
char *oldmessage = pre->szMessage;
diff --git a/plugins/MirOTR/src/svcs_srmm.cpp b/plugins/MirOTR/src/svcs_srmm.cpp
index 27eb741700..62f37c9daa 100644
--- a/plugins/MirOTR/src/svcs_srmm.cpp
+++ b/plugins/MirOTR/src/svcs_srmm.cpp
@@ -9,7 +9,7 @@ int SVC_IconPressed(WPARAM hContact, LPARAM lParam)
if(sicd->cbSize < sizeof(StatusIconClickData))
return 0;
- if(strcmp(sicd->szModule, MODULENAME) == 0) {
+ if(mir_strcmp(sicd->szModule, MODULENAME) == 0) {
char *proto = GetContactProto(hContact);
if(proto && db_get_b(hContact, proto, "ChatRoom", 0))
return 0;
@@ -95,7 +95,7 @@ int SVC_ButtonsBarLoaded(WPARAM, LPARAM)
int SVC_ButtonsBarPressed(WPARAM w, LPARAM l)
{
CustomButtonClickData* cbcd = (CustomButtonClickData *)l;
- if (cbcd->cbSize == sizeof(CustomButtonClickData) && cbcd->dwButtonId == 0 && strcmp(cbcd->pszModule, MODULENAME)==0) {
+ if (cbcd->cbSize == sizeof(CustomButtonClickData) && cbcd->dwButtonId == 0 && mir_strcmp(cbcd->pszModule, MODULENAME)==0) {
MCONTACT hContact = (MCONTACT)w;
char *proto = GetContactProto(hContact);
diff --git a/plugins/MirOTR/src/utils.cpp b/plugins/MirOTR/src/utils.cpp
index 9755c3fc18..31f629d350 100644
--- a/plugins/MirOTR/src/utils.cpp
+++ b/plugins/MirOTR/src/utils.cpp
@@ -11,9 +11,9 @@ MCONTACT find_contact(const char* userid, const char* protocol)
{
for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
const char *proto = GetContactProto(hContact);
- if(proto && strcmp(proto, protocol) == 0) {
+ if(proto && mir_strcmp(proto, protocol) == 0) {
char *name = contact_get_id(hContact);
- if(name && strcmp(name, userid) == 0) {
+ if(name && mir_strcmp(name, userid) == 0) {
mir_free(name);
return hContact;
}