From 5a17c9299e03bebf46169927abdeee34aaf8e854 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 10:06:32 +0000 Subject: replace strlen to mir_strlen git-svn-id: http://svn.miranda-ng.org/main/trunk@13747 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeClassic/src/debug.cpp | 4 +-- protocols/SkypeClassic/src/filexfer.cpp | 8 +++--- protocols/SkypeClassic/src/skype.cpp | 38 ++++++++++++------------- protocols/SkypeClassic/src/skypeapi.cpp | 50 ++++++++++++++++----------------- 4 files changed, 50 insertions(+), 50 deletions(-) (limited to 'protocols/SkypeClassic/src') diff --git a/protocols/SkypeClassic/src/debug.cpp b/protocols/SkypeClassic/src/debug.cpp index 4e7f7fd7b7..5b28e748de 100644 --- a/protocols/SkypeClassic/src/debug.cpp +++ b/protocols/SkypeClassic/src/debug.cpp @@ -51,7 +51,7 @@ void do_log(const char *pszFormat, ...) { EnterCriticalSection(&m_WriteFileMutex); time(<); ct=ctime(<); - ct[strlen(ct)-1]=0; + ct[mir_strlen(ct)-1]=0; do { va_start(ap, pszFormat); @@ -61,7 +61,7 @@ void do_log(const char *pszFormat, ...) { { if (!(pNewBuf = (char*)realloc (m_szLogBuf, m_iBufSize*2))) { - iLen = strlen (m_szLogBuf); + iLen = mir_strlen (m_szLogBuf); break; } m_szLogBuf = pNewBuf; diff --git a/protocols/SkypeClassic/src/filexfer.cpp b/protocols/SkypeClassic/src/filexfer.cpp index d0caedea03..af8af1c1cc 100644 --- a/protocols/SkypeClassic/src/filexfer.cpp +++ b/protocols/SkypeClassic/src/filexfer.cpp @@ -23,7 +23,7 @@ INT_PTR SkypeRecvFile(WPARAM, LPARAM lParam) if (pre->flags & PREF_CREATEREAD) dbei.flags |= DBEF_READ; dbei.eventType = EVENTTYPE_FILE; dbei.cbBlob = sizeof(DWORD); - for (nFiles = 0; cbFilename = strlen(&pre->szMessage[dbei.cbBlob]); nFiles++) + for (nFiles = 0; cbFilename = mir_strlen(&pre->szMessage[dbei.cbBlob]); nFiles++) dbei.cbBlob += DWORD(cbFilename) + 1; dbei.cbBlob++; dbei.pBlob = (PBYTE)pre->szMessage; @@ -41,7 +41,7 @@ INT_PTR SkypeRecvFile(WPARAM, LPARAM lParam) pfts->totalFiles = nFiles; if (pfts->pszFiles = (char**)calloc(nFiles + 1, sizeof(char*))) { char *pFN; - for (size_t i = 0; cbFilename = strlen(pFN = &pre->szMessage[iOffs]); i++) { + for (size_t i = 0; cbFilename = mir_strlen(pFN = &pre->szMessage[iOffs]); i++) { pfts->pszFiles[i] = strdup(pFN); iOffs += cbFilename + 1; } @@ -76,7 +76,7 @@ INT_PTR SkypeSendFile(WPARAM, LPARAM lParam) size_t iLen = 0; for (nFiles = 0; files[nFiles]; nFiles++) { utfmsg = (char*)make_utf8_string(files[nFiles]); - iLen += strlen(utfmsg) + 3; + iLen += mir_strlen(utfmsg) + 3; if (pszFile = pszFile ? (char*)realloc(pszFile, iLen) : (char*)calloc(1, iLen)) { if (nFiles > 0) strcat(pszFile, ","); strcat(pszFile, "\""); @@ -221,7 +221,7 @@ BOOL FXHandleRecv(PROTORECVEVENT *pre, MCONTACT hContact) if (!strcmp(pszType, "INCOMING")) { char *pszFN = SkypeGetErr("FILETRANSFER", pszMsgNum, "FILENAME"); if (pszFN) { - cbNewSize = cbMsg + strlen(pszFN) + 2; + cbNewSize = cbMsg + mir_strlen(pszFN) + 2; if ((pre->szMessage = (char*)realloc(pre->szMessage, cbNewSize))) { memcpy(pre->szMessage + cbMsg, pszFN, cbNewSize - cbMsg - 1); cbMsg = cbNewSize - 1; diff --git a/protocols/SkypeClassic/src/skype.cpp b/protocols/SkypeClassic/src/skype.cpp index e152a1496e..7a28811213 100644 --- a/protocols/SkypeClassic/src/skype.cpp +++ b/protocols/SkypeClassic/src/skype.cpp @@ -222,7 +222,7 @@ int ShowMessage(int iconID, TCHAR *lpzText, int mustShow) { mir_tstrcpy(MessagePopup.lptzText, lpzText); #ifdef _UNICODE - mbstowcs(MessagePopup.lptzContactName, SKYPE_PROTONAME, strlen(SKYPE_PROTONAME) + 1); + mbstowcs(MessagePopup.lptzContactName, SKYPE_PROTONAME, mir_strlen(SKYPE_PROTONAME) + 1); #else mir_tstrcpy(MessagePopup.lptzContactName, SKYPE_PROTONAME); #endif @@ -242,9 +242,9 @@ int ShowMessage(int iconID, TCHAR *lpzText, int mustShow) { int ShowMessageA(int iconID, char *lpzText, int mustShow) { WCHAR *lpwText; int iRet; - size_t len = mbstowcs(NULL, lpzText, strlen(lpzText)); + size_t len = mbstowcs(NULL, lpzText, mir_strlen(lpzText)); if (len == -1 || !(lpwText = (WCHAR*)calloc(len + 1, sizeof(WCHAR)))) return -1; - mbstowcs(lpwText, lpzText, strlen(lpzText)); + mbstowcs(lpwText, lpzText, mir_strlen(lpzText)); iRet = ShowMessage(iconID, lpwText, mustShow); free(lpwText); return iRet; @@ -503,12 +503,12 @@ static void QueryUserWaitingAuthorization(char *pszNick, char *pszAuthRq) } } - pre.lParam = sizeof(DWORD)+sizeof(HANDLE)+strlen(pszNick) + 5; - if (firstname) pre.lParam += strlen(firstname); - if (lastname) pre.lParam += strlen(lastname); + pre.lParam = sizeof(DWORD)+sizeof(HANDLE)+mir_strlen(pszNick) + 5; + if (firstname) pre.lParam += mir_strlen(firstname); + if (lastname) pre.lParam += mir_strlen(lastname); if (pszAuthRq) authmsg = strdup(pszAuthRq); if (authmsg || ((protocol >= 4 || bIsImoproxy) && (authmsg = SkypeGetID("USER", pszNick, "RECEIVEDAUTHREQUEST")))) - pre.lParam += strlen(authmsg); + pre.lParam += mir_strlen(authmsg); if (pre.szMessage = pCurBlob = (char *)calloc(1, pre.lParam)) { pCurBlob += sizeof(DWORD); // Not used memcpy(pCurBlob, &hContact, sizeof(HANDLE)); pCurBlob += sizeof(HANDLE); @@ -644,7 +644,7 @@ void __cdecl SkypeSystemInit(char *dummy) { // against CURRENTUSERHANDLE if (pszUser = SkypeRcv("CURRENTUSERHANDLE", INFINITE)) { - memmove(pszUser, pszUser + 18, strlen(pszUser + 17)); + memmove(pszUser, pszUser + 18, mir_strlen(pszUser + 17)); if (_stricmp(dbv.pszVal, pszUser)) { // Doesn't match, maybe we have a second Skype instance we have to take @@ -1133,7 +1133,7 @@ void FetchMessageThread(fetchmsg_arg *pargs) { __leave; // We failed } free(who); - who = (char *)memmove(ptr, pTok, strlen(pTok) + 1); + who = (char *)memmove(ptr, pTok, mir_strlen(pTok) + 1); direction = DBEF_SENT; } db_free(&dbv); @@ -1167,7 +1167,7 @@ void FetchMessageThread(fetchmsg_arg *pargs) { __leave; } if (strncmp(ptr, "ERROR", 5)) { - msgptr = ptr + strlen(szBuf + 4) + 1; + msgptr = ptr + mir_strlen(szBuf + 4) + 1; bHasPartList = strncmp(msgptr, "tEdited) { // Mark the message as edited @@ -1202,7 +1202,7 @@ void FetchMessageThread(fetchmsg_arg *pargs) { mir_free(ci.pszVal); } } - newlen = int(strlen(msgptr) + (pszUTFnick ? strlen(pszUTFnick) : 0) + 9); + newlen = int(mir_strlen(msgptr) + (pszUTFnick ? mir_strlen(pszUTFnick) : 0) + 9); if (pMsg = (char *)malloc(newlen)) { sprintf(pMsg, "** %s%s%s **", (pszUTFnick ? pszUTFnick : ""), (pszUTFnick ? " " : ""), (char*)msgptr); free(ptr); @@ -1225,7 +1225,7 @@ void FetchMessageThread(fetchmsg_arg *pargs) { msgptr = msg; free(ptr); } - msglen = (int)strlen(msgptr) + 1; + msglen = (int)mir_strlen(msgptr) + 1; } else { free(ptr); @@ -1538,7 +1538,7 @@ void RingThread(char *szSkypeMsg) { dbei.szModule = SKYPE_PROTONAME; dbei.timestamp = (DWORD)SkypeTime(NULL); dbei.pBlob = (unsigned char*)Translate("Phone call"); - dbei.cbBlob = (int)strlen((const char*)dbei.pBlob) + 1; + dbei.cbBlob = (int)mir_strlen((const char*)dbei.pBlob) + 1; if (!strncmp(ptr, "INCOMING", 8)) { TCHAR *lpzContactName = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR); @@ -1990,7 +1990,7 @@ LRESULT APIENTRY WndProc(HWND hWndDlg, UINT message, UINT wParam, LONG lParam) // Other proerties that can be directly assigned to a DB-Value for (int i = 0; i < sizeof(m_settings) / sizeof(m_settings[0]); i++) { if (!strcmp(ptr, m_settings[i].SkypeSetting)) { - char *pszProp = ptr + strlen(m_settings[i].SkypeSetting) + 1; + char *pszProp = ptr + mir_strlen(m_settings[i].SkypeSetting) + 1; if (*pszProp) db_set_utf(hContact, SKYPE_PROTONAME, m_settings[i].MirandaSetting, pszProp); else @@ -2070,7 +2070,7 @@ LRESULT APIENTRY WndProc(HWND hWndDlg, UINT message, UINT wParam, LONG lParam) *ptr = ' '; } else if (strncmp(ptr, " CHATMESSAGES ", 14) == 0) { - int iLen=strlen(ptr+14)+1; + int iLen=mir_strlen(ptr+14)+1; char *pParam=(char*)calloc(iLen+1, 1); *pParam=TRUE; memcpy(pParam+1, ptr+14, iLen); @@ -2128,14 +2128,14 @@ LRESULT APIENTRY WndProc(HWND hWndDlg, UINT message, UINT wParam, LONG lParam) if (!strncmp(szSkypeMsg, "MESSAGES", 8) || !strncmp(szSkypeMsg, "CHATMESSAGES", 12)) { char *pMsgs; int iLen; - if (strlen(szSkypeMsg) <= (UINT)((pMsgs=strchr(szSkypeMsg, ' ')) - szSkypeMsg + 1)) + if (mir_strlen(szSkypeMsg) <= (UINT)((pMsgs=strchr(szSkypeMsg, ' ')) - szSkypeMsg + 1)) { LOG(("%s %d %s %d", szSkypeMsg, (UINT)(strchr(szSkypeMsg, ' ') - szSkypeMsg + 1), - strchr(szSkypeMsg, ' '), strlen(szSkypeMsg))); + strchr(szSkypeMsg, ' '), mir_strlen(szSkypeMsg))); break; } LOG(("MessageListProcessingThread launched")); - char *pParam=(char*)calloc((iLen=strlen(pMsgs)+1)+1, 1); + char *pParam=(char*)calloc((iLen=mir_strlen(pMsgs)+1)+1, 1); memcpy(pParam+1, pMsgs, iLen); pthread_create((pThreadFunc)MessageListProcessingThread, pParam); break; @@ -2754,7 +2754,7 @@ INT_PTR SkypeRecvMessage(WPARAM, LPARAM lParam) dbei.flags |= DBEF_READ; dbei.flags |= DBEF_UTF; dbei.eventType = EVENTTYPE_MESSAGE; - dbei.cbBlob = (int)strlen(pre->szMessage) + 1; + dbei.cbBlob = (int)mir_strlen(pre->szMessage) + 1; dbei.pBlob = (PBYTE)pre->szMessage; MsgList_Add((DWORD)pre->lParam, db_event_add(ccs->hContact, &dbei)); return 0; diff --git a/protocols/SkypeClassic/src/skypeapi.cpp b/protocols/SkypeClassic/src/skypeapi.cpp index bd8b8d6d11..35b4117560 100644 --- a/protocols/SkypeClassic/src/skypeapi.cpp +++ b/protocols/SkypeClassic/src/skypeapi.cpp @@ -195,7 +195,7 @@ void rcvThread(char *dummy) { COPYDATASTRUCT CopyData; CopyData.dwData=0; CopyData.lpData=buf; - CopyData.cbData=(DWORD)strlen(buf)+1; + CopyData.cbData=(DWORD)mir_strlen(buf)+1; if (!SendMessage(g_hWnd, WM_COPYDATALOCAL, (WPARAM)hSkypeWnd, (LPARAM)&CopyData)) { LOG(("SendMessage failed: %08X", GetLastError())); @@ -215,7 +215,7 @@ void sendThread(char *dummy) { while (SkypeMsgToSend) { if (WaitForSingleObject(SkypeMsgToSend, INFINITE) != WAIT_OBJECT_0) return; if (!(szMsg = MsgQ_Get(&SkypeSendQueue))) continue; - length=(unsigned int)strlen(szMsg); + length=(unsigned int)mir_strlen(szMsg); if (UseSockets) { mir_cslock lck(SendMutex); @@ -397,7 +397,7 @@ int SkypeSend(char *szFmt, ...) { { if (!(pNewBuf = (char*)realloc (m_szSendBuf, m_iBufSize*2))) { - iLen = strlen (m_szSendBuf); + iLen = mir_strlen (m_szSendBuf); break; } m_szSendBuf = pNewBuf; @@ -450,23 +450,23 @@ char *SkypeRcvTime(char *what, time_t st, DWORD maxwait) { token=NULL; break; } - token+=strlen(token)+1; + token+=mir_strlen(token)+1; } } //if (j==1) {LOG(("SkypeRcv compare %s (%lu) -- %s (%lu)", ptr->message, ptr->tReceived, what, st));} if ((st == 0 || ptr->tReceived >= st) && - (what==NULL || token || (what[0] && !strncmp(ptr->message, what, strlen(what))) || - (bIsChatMsg = (j==1 && bChatMsg && !strncmp(ptr->message, what+4, strlen(what+4)))) || + (what==NULL || token || (what[0] && !strncmp(ptr->message, what, mir_strlen(what))) || + (bIsChatMsg = (j==1 && bChatMsg && !strncmp(ptr->message, what+4, mir_strlen(what+4)))) || (j==1 && !strncmp(ptr->message, "ERROR", 5)))) { msg=MsgQ_RemoveMsg(&SkypeMsgs, ptr); LOG(("tReceived >= st && (strncmp(pCurMsg, "MESSAGE", 7) == 0 || strncmp(pCurMsg, "CHATMESSAGE", 11) == 0 ) ) || bIsError || @@ -586,7 +586,7 @@ static char *__SkypeGet(char *szID, char *szWhat, char *szWho, char *szProperty) time_t st = 0; st = *szID?0:SkypeTime(NULL); - str=(char *)_alloca((len=strlen(szWhat)+strlen(szWho)+strlen(szProperty)+(*szWho?2:1)+(len_id=strlen(szID)))+5); + str=(char *)_alloca((len=mir_strlen(szWhat)+mir_strlen(szWho)+mir_strlen(szProperty)+(*szWho?2:1)+(len_id=mir_strlen(szID)))+5); sprintf(str, "%sGET %s%s%s %s", szID, szWhat, *szWho?" ":"", szWho, szProperty); if (__sendMsg(str)) return NULL; if (*szProperty) len++; @@ -594,7 +594,7 @@ static char *__SkypeGet(char *szID, char *szWhat, char *szWho, char *szProperty) sprintf(str, "%s%s%s%s %s", szID, szWhat, *szWho?" ":"", szWho, szProperty); ptr = SkypeRcvTime(str, st, INFINITE); } else ptr = SkypeRcvTime(str+4, st, INFINITE); - if (ptr && strncmp (ptr+len_id, "ERROR", 5)) memmove(ptr, ptr+len, strlen(ptr)-len+1); + if (ptr && strncmp (ptr+len_id, "ERROR", 5)) memmove(ptr, ptr+len, mir_strlen(ptr)-len+1); LOG(("SkypeGet - Request %s -> Answer %s", str, ptr)); return ptr; } @@ -708,7 +708,7 @@ INT_PTR SkypeCall(WPARAM wParam, LPARAM lParam) { res = -1; // no direct return, because dbv needs to be freed } else { if (db_get_s(hContact, SKYPE_PROTONAME, SKYPE_NAME, &dbv)) return -1; - msg=(char *)malloc(strlen(dbv.pszVal)+6); + msg=(char *)malloc(mir_strlen(dbv.pszVal)+6); strcpy(msg, "CALL "); strcat(msg, dbv.pszVal); res=SkypeSend(msg); @@ -737,7 +737,7 @@ INT_PTR SkypeCallHangup(WPARAM wParam, LPARAM lParam) char *msg=0; if (!db_get_s(hContact, SKYPE_PROTONAME, "CallId", &dbv)) { - msg=(char *)malloc(strlen(dbv.pszVal)+21); + msg=(char *)malloc(mir_strlen(dbv.pszVal)+21); sprintf(msg, "SET %s STATUS FINISHED", dbv.pszVal); //sprintf(msg, "ALTER CALL %s HANGUP", dbv.pszVal); int res=SkypeSend(msg); @@ -746,7 +746,7 @@ INT_PTR SkypeCallHangup(WPARAM wParam, LPARAM lParam) #endif //} else { // if (db_get(hContact, SKYPE_PROTONAME, SKYPE_NAME, &dbv)) return -1; - // msg=(char *)malloc(strlen(dbv.pszVal)+6); + // msg=(char *)malloc(mir_strlen(dbv.pszVal)+6); // strcpy(msg, "CALL "); // strcat(msg, dbv.pszVal); // res=SkypeSend(msg); @@ -763,10 +763,10 @@ INT_PTR SkypeCallHangup(WPARAM wParam, LPARAM lParam) * Params : p - Pointer to the buffer with the number */ static void FixNumber(char *p) { - for (unsigned int i=0;i<=strlen(p);i++) + for (unsigned int i=0;i<=mir_strlen(p);i++) if ((p[i]<'0' || p[i]>'9')) if (p[i]) { - memmove(p+i, p+i+1, strlen(p+i)); + memmove(p+i, p+i+1, mir_strlen(p+i)); i--; } else break; } @@ -863,7 +863,7 @@ static INT_PTR CALLBACK DialDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR TempAdded=TRUE; } if (!db_set_s(hContact, SKYPE_PROTONAME, "SkypeOutNr", number)) { - msg=(char *)malloc(strlen(number)+6); + msg=(char *)malloc(mir_strlen(number)+6); strcpy(msg, "CALL "); strcat(msg, number); if (SkypeSend(msg) || (ptr=SkypeRcv("ERROR", 500))) { @@ -1152,7 +1152,7 @@ INT_PTR SkypeSetAvatar(WPARAM wParam, LPARAM lParam) { if (filename == NULL) return -1; - len = strlen(filename); + len = mir_strlen(filename); if (len < 4) return -1; @@ -1374,7 +1374,7 @@ char *GetSkypeErrorMsg(char *str) { case SENDER_NOT_AUTHORIZED: msg=Translate("Sending IM message to user, who has not authorized you and has chosen 'only people whom I have authorized can start IM'"); break; default: msg=Translate("Unknown error"); } - reason=(char *)malloc(strlen(pos)+strlen(msg)+3); + reason=(char *)malloc(mir_strlen(pos)+mir_strlen(msg)+3); sprintf (reason, "%s: %s", pos, msg); return reason; } @@ -1438,7 +1438,7 @@ void TranslateMirandaRelativePathToAbsolute(LPCSTR cszPath, LPSTR szAbsolutePath *szAbsolutePath = 0; CallService (MS_UTILS_PATHTOABSOLUTE, (WPARAM)(*cszPath ? cszPath : ".\\"), (LPARAM)szAbsolutePath); if(fQuoteSpaces && strchr((LPCSTR)szAbsolutePath, ' ')){ - memmove (szAbsolutePath+1, szAbsolutePath, strlen(szAbsolutePath)+1); + memmove (szAbsolutePath+1, szAbsolutePath, mir_strlen(szAbsolutePath)+1); *szAbsolutePath='"'; strcat (szAbsolutePath, "\""); } @@ -1455,7 +1455,7 @@ static int my_spawnv(const char *cmdname, const char *const *argv, PROCESS_INFOR memset (pi, 0, sizeof(PROCESS_INFORMATION)); for (i=0; argv[i]; i++) - iLen += (int)strlen(argv[i])+1; + iLen += (int)mir_strlen(argv[i])+1; if (!(CommandLine = (char*)calloc(1, iLen))) return -1; for (i=0; argv[i]; i++) { if (i) strcat (CommandLine, " "); @@ -1523,7 +1523,7 @@ static int _ConnectToSkypeAPI(char *path, int iStart) { OUTPUT(TranslateT("Authentication is not supported/needed for this Skype proxy server. It will be disabled.")); db_set_b(NULL, SKYPE_PROTONAME, "RequiresPassword", 0); } else { - unsigned int length=(unsigned int)strlen(dbv.pszVal); + unsigned int length=(unsigned int)mir_strlen(dbv.pszVal); BOOL res = send(ClientSocket, (char *)&length, sizeof(length), 0)==SOCKET_ERROR || send(ClientSocket, dbv.pszVal, length, 0)==SOCKET_ERROR || recv(ClientSocket, (char *)&reply, sizeof(reply), 0)==SOCKET_ERROR; @@ -1645,7 +1645,7 @@ static int _ConnectToSkypeAPI(char *path, int iStart) { { int paramSize; TranslateMirandaRelativePathToAbsolute(dbv.pszVal, szAbsolutePath, TRUE); - paramSize = (int)strlen(SkypeOptions[i]) + (int)strlen(szAbsolutePath); + paramSize = (int)mir_strlen(SkypeOptions[i]) + (int)mir_strlen(szAbsolutePath); pFree = args[j] = (char*)malloc(paramSize + 1); sprintf(args[j],"%s%s",SkypeOptions[i],szAbsolutePath); db_free(&dbv); @@ -1692,7 +1692,7 @@ static int _ConnectToSkypeAPI(char *path, int iStart) { }*/ // if there is no skype installed and no custom command line, then exit .. else it crashes - if (args[0] == NULL || strlen(args[0])==0) + if (args[0] == NULL || mir_strlen(args[0])==0) { return -1; } -- cgit v1.2.3