summaryrefslogtreecommitdiff
path: root/plugins/UserInfoEx/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/UserInfoEx/src')
-rw-r--r--plugins/UserInfoEx/src/commonheaders.h2
-rw-r--r--plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp2
-rw-r--r--plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp54
-rw-r--r--plugins/UserInfoEx/src/ex_import/tinystr.h6
-rw-r--r--plugins/UserInfoEx/src/ex_import/tinyxml.cpp16
-rw-r--r--plugins/UserInfoEx/src/mir_db.cpp2
-rw-r--r--plugins/UserInfoEx/src/psp_profile.cpp2
-rw-r--r--plugins/UserInfoEx/src/svc_constants.cpp2
-rw-r--r--plugins/UserInfoEx/src/svc_phone.cpp8
-rw-r--r--plugins/UserInfoEx/src/svc_reminder.cpp2
10 files changed, 48 insertions, 48 deletions
diff --git a/plugins/UserInfoEx/src/commonheaders.h b/plugins/UserInfoEx/src/commonheaders.h
index 940553dac9..2348a06b5d 100644
--- a/plugins/UserInfoEx/src/commonheaders.h
+++ b/plugins/UserInfoEx/src/commonheaders.h
@@ -89,7 +89,7 @@ using namespace std;
* UserInfoEx plugin includes and macros
***********************************************************************************************************/
-#pragma intrinsic(memcmp, memcpy, memset, strcmp, mir_strlen)
+#pragma intrinsic(memcmp, memcpy, memset, mir_strcmp, mir_strlen)
#ifndef MIR_OK
#define MIR_OK 0 // success value of a miranda service function
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index 0e409bc24a..d73bcd334a 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
@@ -498,7 +498,7 @@ int CExImContactXML::LoadXmlElemnt(TiXmlElement *xContact)
MIR_FREE(_pszUIDKey);
// is contact a metacontact
- if (_pszAMPro && !strcmp(_pszAMPro, META_PROTO)) {
+ if (_pszAMPro && !mir_strcmp(_pszAMPro, META_PROTO)) {
TiXmlElement *xSub;
proto(META_PROTO);
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
index 39ffd48918..8dff63f5d4 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
@@ -1160,13 +1160,13 @@ BYTE CVCardFileVCF::Import()
}
switch (*szEnt) {
case 'A':
- if (!strcmp(szEnt, "ABOUT")) {
+ if (!mir_strcmp(szEnt, "ABOUT")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_ABOUT);
continue;
}
- if (!strcmp(szEnt, "ADR")) {
+ if (!mir_strcmp(szEnt, "ADR")) {
if (!pszParam) continue;
- if (!strcmp(pszParam, "HOME")) {
+ if (!mir_strcmp(pszParam, "HOME")) {
_clVal.GetTokenFirst(';', NULL);
_clVal.GetTokenNext(';', NULL);
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_STREET, ';');
@@ -1176,7 +1176,7 @@ BYTE CVCardFileVCF::Import()
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_COUNTRY, ';');
continue;
}
- if (!strcmp(pszParam, "WORK")) {
+ if (!mir_strcmp(pszParam, "WORK")) {
_clVal.GetTokenFirst(';', NULL);
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_COMPANY_OFFICE, ';');
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_COMPANY_STREET, ';');
@@ -1186,7 +1186,7 @@ BYTE CVCardFileVCF::Import()
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_COMPANY_COUNTRY, ';');
continue;
}
- if (!strcmp(pszParam, "POSTAL")) {
+ if (!mir_strcmp(pszParam, "POSTAL")) {
_clVal.GetTokenFirst(';', NULL);
_clVal.GetTokenNext(';', NULL);
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_ORIGIN_STREET, ';');
@@ -1199,7 +1199,7 @@ BYTE CVCardFileVCF::Import()
continue;
case 'B':
- if (!strcmp(szEnt, "BDAY")) {
+ if (!mir_strcmp(szEnt, "BDAY")) {
if (_clVal.GetLength() == 8) {
CHAR buf[5];
@@ -1217,7 +1217,7 @@ BYTE CVCardFileVCF::Import()
continue;
case 'E':
- if (!strcmp(szEnt, "EMAIL")) {
+ if (!mir_strcmp(szEnt, "EMAIL")) {
if (!pszParam || !strstr(pszParam, "intERNET"))
continue;
if (strstr(pszParam, "PREF")) {
@@ -1236,7 +1236,7 @@ BYTE CVCardFileVCF::Import()
continue;
/*
case 'I':
- if (!strcmp(szEnt, "IM")) {
+ if (!mir_strcmp(szEnt, "IM")) {
LPSTR pszModule, pszSetting;
if (pszParam && (pszModule = strtok(pszParam, DELIM)) && (pszSetting = strtok(NULL, DELIM)))
@@ -1245,7 +1245,7 @@ BYTE CVCardFileVCF::Import()
continue;
*/
case 'N':
- if (!strcmp(szEnt, "N")) {
+ if (!mir_strcmp(szEnt, "N")) {
_clVal.DBWriteTokenFirst(_hContact, USERINFO, SET_CONTACT_LASTNAME, ';');
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_FIRSTNAME, ';');
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_SECONDNAME, ';');
@@ -1253,58 +1253,58 @@ BYTE CVCardFileVCF::Import()
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_PREFIX, ';');
continue;
}
- if (!strcmp(szEnt, "NICKNAME")) {
+ if (!mir_strcmp(szEnt, "NICKNAME")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_NICK);
continue;
}
- if (!strcmp(szEnt, "NOTE")) {
+ if (!mir_strcmp(szEnt, "NOTE")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_MYNOTES);
}
continue;
case 'O':
- if (!strcmp(szEnt, "ORG")) {
+ if (!mir_strcmp(szEnt, "ORG")) {
_clVal.DBWriteTokenFirst(_hContact, USERINFO, SET_CONTACT_COMPANY, ';');
_clVal.DBWriteTokenNext(_hContact, USERINFO, SET_CONTACT_COMPANY_DEPARTMENT, ';');
}
continue;
case 'R':
- if (!strcmp(szEnt, "ROLE")) {
+ if (!mir_strcmp(szEnt, "ROLE")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_COMPANY_OCCUPATION);
}
continue;
case 'T':
- if (!strcmp(szEnt, "TITLE")) {
+ if (!mir_strcmp(szEnt, "TITLE")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_COMPANY_POSITION);
continue;
}
- if (!strcmp(szEnt, "TEL")) {
+ if (!mir_strcmp(szEnt, "TEL")) {
if (!pszParam) continue;
- if (!strcmp(pszParam, "HOME;VOICE")) {
+ if (!mir_strcmp(pszParam, "HOME;VOICE")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_PHONE);
continue;
}
- if (!strcmp(pszParam, "HOME;FAX")) {
+ if (!mir_strcmp(pszParam, "HOME;FAX")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_FAX);
continue;
}
- if (!strcmp(pszParam, "CELL;VOICE")) {
+ if (!mir_strcmp(pszParam, "CELL;VOICE")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_CELLULAR);
continue;
}
- if (!strcmp(pszParam, "WORK;VOICE")) {
+ if (!mir_strcmp(pszParam, "WORK;VOICE")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_COMPANY_PHONE);
continue;
}
- if (!strcmp(pszParam, "WORK;FAX")) {
+ if (!mir_strcmp(pszParam, "WORK;FAX")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_COMPANY_FAX);
continue;
}
- if (!strcmp(pszParam, "PAGER;VOICE")) {
+ if (!mir_strcmp(pszParam, "PAGER;VOICE")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_COMPANY_CELLULAR);
continue;
}
@@ -1312,25 +1312,25 @@ BYTE CVCardFileVCF::Import()
continue;
case 'U':
- if (!strcmp(szEnt, "URL")) {
+ if (!mir_strcmp(szEnt, "URL")) {
if (!pszParam) continue;
- if (!strcmp(pszParam, "HOME")) {
+ if (!mir_strcmp(pszParam, "HOME")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_HOMEPAGE);
continue;
}
- if (!strcmp(pszParam, "WORK")) {
+ if (!mir_strcmp(pszParam, "WORK")) {
_clVal.DBWriteSettingString(_hContact, USERINFO, SET_CONTACT_COMPANY_HOMEPAGE);
}
}
continue;
case 'X':
- if (!strcmp(szEnt, "X-WAB-GENDER")) {
- if (!strcmp(_clVal.GetBuffer(), "1"))
+ if (!mir_strcmp(szEnt, "X-WAB-GENDER")) {
+ if (!mir_strcmp(_clVal.GetBuffer(), "1"))
db_set_b(_hContact, USERINFO, SET_CONTACT_GENDER, 'F');
- else if (!strcmp(_clVal.GetBuffer(), "2"))
+ else if (!mir_strcmp(_clVal.GetBuffer(), "2"))
db_set_b(_hContact, USERINFO, SET_CONTACT_GENDER, 'M');
}
continue;
diff --git a/plugins/UserInfoEx/src/ex_import/tinystr.h b/plugins/UserInfoEx/src/ex_import/tinystr.h
index 9c66f2b7e9..2658a4f639 100644
--- a/plugins/UserInfoEx/src/ex_import/tinystr.h
+++ b/plugins/UserInfoEx/src/ex_import/tinystr.h
@@ -262,11 +262,11 @@ class TiXmlString
inline bool operator == (const TiXmlString & a, const TiXmlString & b)
{
return (a.length() == b.length()) // optimization on some platforms
- && (strcmp(a.c_str(), b.c_str()) == 0); // actual compare
+ && (mir_strcmp(a.c_str(), b.c_str()) == 0); // actual compare
}
inline bool operator < (const TiXmlString & a, const TiXmlString & b)
{
- return strcmp(a.c_str(), b.c_str()) < 0;
+ return mir_strcmp(a.c_str(), b.c_str()) < 0;
}
inline bool operator != (const TiXmlString & a, const TiXmlString & b) { return !(a == b); }
@@ -274,7 +274,7 @@ inline bool operator > (const TiXmlString & a, const TiXmlString & b) { return b
inline bool operator <= (const TiXmlString & a, const TiXmlString & b) { return !(b < a); }
inline bool operator >= (const TiXmlString & a, const TiXmlString & b) { return !(a < b); }
-inline bool operator == (const TiXmlString & a, const char* b) { return strcmp(a.c_str(), b) == 0; }
+inline bool operator == (const TiXmlString & a, const char* b) { return mir_strcmp(a.c_str(), b) == 0; }
inline bool operator == (const char* a, const TiXmlString & b) { return b == a; }
inline bool operator != (const TiXmlString & a, const char* b) { return !(a == b); }
inline bool operator != (const char* a, const TiXmlString & b) { return !(b == a); }
diff --git a/plugins/UserInfoEx/src/ex_import/tinyxml.cpp b/plugins/UserInfoEx/src/ex_import/tinyxml.cpp
index 2c815d536c..2692a3196f 100644
--- a/plugins/UserInfoEx/src/ex_import/tinyxml.cpp
+++ b/plugins/UserInfoEx/src/ex_import/tinyxml.cpp
@@ -357,7 +357,7 @@ const TiXmlNode* TiXmlNode::FirstChild(const char * _value) const
const TiXmlNode* node;
for (node = firstChild; node; node = node->next)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
@@ -369,7 +369,7 @@ TiXmlNode* TiXmlNode::FirstChild(const char * _value)
TiXmlNode* node;
for (node = firstChild; node; node = node->next)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
@@ -381,7 +381,7 @@ const TiXmlNode* TiXmlNode::LastChild(const char * _value) const
const TiXmlNode* node;
for (node = lastChild; node; node = node->prev)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
@@ -392,7 +392,7 @@ TiXmlNode* TiXmlNode::LastChild(const char * _value)
TiXmlNode* node;
for (node = lastChild; node; node = node->prev)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
@@ -455,7 +455,7 @@ const TiXmlNode* TiXmlNode::NextSibling(const char * _value) const
const TiXmlNode* node;
for (node = next; node; node = node->next)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
@@ -466,7 +466,7 @@ TiXmlNode* TiXmlNode::NextSibling(const char * _value)
TiXmlNode* node;
for (node = next; node; node = node->next)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
@@ -477,7 +477,7 @@ const TiXmlNode* TiXmlNode::PreviousSibling(const char * _value) const
const TiXmlNode* node;
for (node = prev; node; node = node->prev)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
@@ -488,7 +488,7 @@ TiXmlNode* TiXmlNode::PreviousSibling(const char * _value)
TiXmlNode* node;
for (node = prev; node; node = node->prev)
{
- if (strcmp(node->Value(), _value) == 0)
+ if (mir_strcmp(node->Value(), _value) == 0)
return node;
}
return 0;
diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp
index 972e9790ba..59e8db3473 100644
--- a/plugins/UserInfoEx/src/mir_db.cpp
+++ b/plugins/UserInfoEx/src/mir_db.cpp
@@ -732,7 +732,7 @@ int CEnumList::CompareProc(LPCSTR p1, LPCSTR p2)
{
if (p1) {
if (p2)
- return strcmp(p1, p2);
+ return mir_strcmp(p1, p2);
return 1;
}
diff --git a/plugins/UserInfoEx/src/psp_profile.cpp b/plugins/UserInfoEx/src/psp_profile.cpp
index edeb7e472c..741ceb6fd7 100644
--- a/plugins/UserInfoEx/src/psp_profile.cpp
+++ b/plugins/UserInfoEx/src/psp_profile.cpp
@@ -527,7 +527,7 @@ static int ProfileList_AddItemlistFromDB(
continue;
break;
case DBVT_ASCIIZ:
- if (strcmp(dbvCat.pszVal, idList[j].pszText))
+ if (mir_strcmp(dbvCat.pszVal, idList[j].pszText))
continue;
break;
}
diff --git a/plugins/UserInfoEx/src/svc_constants.cpp b/plugins/UserInfoEx/src/svc_constants.cpp
index 9cd745643a..240d6ae1b8 100644
--- a/plugins/UserInfoEx/src/svc_constants.cpp
+++ b/plugins/UserInfoEx/src/svc_constants.cpp
@@ -277,7 +277,7 @@ static void SvcConstantsTranslateList(LPIDSTRLIST pList, UINT nListCount/*, Sort
pList[i].ptszTranslated = (LPTSTR)CallService(MS_LANGPACK_PCHARTOTCHAR, 0, (LPARAM)pList[i].pszText);
}
// Ignore last item, if it is a "Other" item.
- if (!strcmp(pList[nListCount-1].pszText, LPGEN("Other"))) nListCount--;
+ if (!mir_strcmp(pList[nListCount-1].pszText, LPGEN("Other"))) nListCount--;
// Sort list according translated text and ignore first item.
qsort(pList+1, nListCount-1, sizeof(pList[0]),
diff --git a/plugins/UserInfoEx/src/svc_phone.cpp b/plugins/UserInfoEx/src/svc_phone.cpp
index f43e0a48c4..130976526b 100644
--- a/plugins/UserInfoEx/src/svc_phone.cpp
+++ b/plugins/UserInfoEx/src/svc_phone.cpp
@@ -109,10 +109,10 @@ static int OnContactSettingChanged(MCONTACT hContact, DBCONTACTWRITESETTING* pdb
{
if (hContact && pdbcws && pdbcws->szSetting &&
((pdbcws->value.type & DBVTF_VARIABLELENGTH) || (pdbcws->value.type == DBVT_DELETED)) &&
- (!strcmp(pdbcws->szSetting, SET_CONTACT_PHONE) ||
- !strcmp(pdbcws->szSetting, SET_CONTACT_CELLULAR) ||
- !strcmp(pdbcws->szSetting, SET_CONTACT_COMPANY_PHONE) ||
- !strcmp(pdbcws->szSetting, SET_CONTACT_COMPANY_CELLULAR) ||
+ (!mir_strcmp(pdbcws->szSetting, SET_CONTACT_PHONE) ||
+ !mir_strcmp(pdbcws->szSetting, SET_CONTACT_CELLULAR) ||
+ !mir_strcmp(pdbcws->szSetting, SET_CONTACT_COMPANY_PHONE) ||
+ !mir_strcmp(pdbcws->szSetting, SET_CONTACT_COMPANY_CELLULAR) ||
!strncmp(pdbcws->szSetting, "MyPhone0", 8)))
OnCListApplyIcons(hContact, 0);
diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp
index 04f54a39b7..4c0f839e5a 100644
--- a/plugins/UserInfoEx/src/svc_reminder.cpp
+++ b/plugins/UserInfoEx/src/svc_reminder.cpp
@@ -657,7 +657,7 @@ static int OnContactSettingChanged(MCONTACT hContact, DBCONTACTWRITESETTING* pdb
CEvent evt;
MTime now;
now.GetLocalTime();
- if (!strcmp(pdbcws->szModule, SvcReminderGetMyBirthdayModule())) {
+ if (!mir_strcmp(pdbcws->szModule, SvcReminderGetMyBirthdayModule())) {
WORD LastAnswer = IDNONE;
CheckContact(hContact, now, evt, FALSE, &LastAnswer);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 07:10:49 +0000