From c370af60855db957c5b200914bf0bde743845528 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 28 Aug 2015 16:22:41 +0000 Subject: mir_sntprintf / mir_snprintf: obsoleted second parameter removed wherever possible git-svn-id: http://svn.miranda-ng.org/main/trunk@15064 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/src/clcitems.cpp | 2 +- plugins/Clist_nicer/src/clistmod.cpp | 2 +- plugins/Clist_nicer/src/clui.cpp | 10 +++---- plugins/Clist_nicer/src/cluiframes.cpp | 6 ++-- plugins/Clist_nicer/src/cluiservices.cpp | 2 +- plugins/Clist_nicer/src/config.cpp | 10 +++---- plugins/Clist_nicer/src/extBackg.cpp | 48 ++++++++++++++++---------------- plugins/Clist_nicer/src/statusbar.cpp | 2 +- plugins/Clist_nicer/src/viewmodes.cpp | 4 +-- 9 files changed, 43 insertions(+), 43 deletions(-) (limited to 'plugins/Clist_nicer') diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp index 1efaba03ad..6dbfb937d6 100644 --- a/plugins/Clist_nicer/src/clcitems.cpp +++ b/plugins/Clist_nicer/src/clcitems.cpp @@ -485,7 +485,7 @@ int __fastcall CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, str } if (cfg::dat.bFilterEffective & CLVM_FILTER_GROUPS) { if (!cfg::getTString(hContact, "CList", "Group", &dbv)) { - mir_sntprintf(szGroupMask, _countof(szGroupMask), _T("%s|"), &dbv.ptszVal[1]); + mir_sntprintf(szGroupMask, _T("%s|"), &dbv.ptszVal[1]); filterResult = (cfg::dat.filterFlags & CLVM_PROTOGROUP_OP) ? (filterResult | (_tcsstr(cfg::dat.groupFilter, szGroupMask) ? 1 : 0)) : (filterResult & (_tcsstr(cfg::dat.groupFilter, szGroupMask) ? 1 : 0)); mir_free(dbv.ptszVal); } diff --git a/plugins/Clist_nicer/src/clistmod.cpp b/plugins/Clist_nicer/src/clistmod.cpp index e590392b4d..b1e87183be 100644 --- a/plugins/Clist_nicer/src/clistmod.cpp +++ b/plugins/Clist_nicer/src/clistmod.cpp @@ -66,7 +66,7 @@ int IconFromStatusMode(const char *szProto, int status, MCONTACT hContact, HICON if (status >= ID_STATUS_CONNECTING && status < ID_STATUS_OFFLINE && phIcon != NULL) { if (szProto) { char szBuf[128]; - mir_snprintf(szBuf, _countof(szBuf), "%s_conn", szProto); + mir_snprintf(szBuf, "%s_conn", szProto); *phIcon = IcoLib_GetIcon(szBuf); } } diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index 752cc0c8c2..d7705d4239 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -246,7 +246,7 @@ static void CacheClientIcons() for (int i = IDI_OVL_OFFLINE; i <= IDI_OVL_OUTTOLUNCH; i++) { char szBuffer[128]; - mir_snprintf(szBuffer, _countof(szBuffer), "cln_ovl_%d", ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE)); + mir_snprintf(szBuffer, "cln_ovl_%d", ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE)); overlayicons[i - IDI_OVL_OFFLINE] = IcoLib_GetIcon(szBuffer); } } @@ -257,7 +257,7 @@ static void InitIcoLib() for (int i = IDI_OVL_OFFLINE; i <= IDI_OVL_OUTTOLUNCH; i++) { char szBuffer[128]; - mir_snprintf(szBuffer, _countof(szBuffer), "cln_ovl_%d", ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE)); + mir_snprintf(szBuffer, "cln_ovl_%d", ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE)); IconItemT icon = { pcli->pfnGetStatusModeDescription(ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE), 0), szBuffer, i }; Icon_RegisterT(g_hInst, LPGENT("Contact list") _T("/") LPGENT("Overlay icons"), &icon, 1); } @@ -270,7 +270,7 @@ static void InitIcoLib() continue; TCHAR szDescr[128]; - mir_sntprintf(szDescr, _countof(szDescr), TranslateT("%s connecting"), accs[k]->tszAccountName); + mir_sntprintf(szDescr, TranslateT("%s connecting"), accs[k]->tszAccountName); IconItemT icon = { szDescr, "conn", IDI_PROTOCONNECTING }; Icon_RegisterT(g_hInst, LPGENT("Contact list") _T("/") LPGENT("Connecting icons"), &icon, 1, accs[k]->szModuleName); } @@ -1420,7 +1420,7 @@ skipbg: if (serviceFailure) { char szError[512]; - mir_snprintf(szError, _countof(szError), Translate("The service %s specified by the %s button definition was not found. You may need to install additional plugins."), item->szService, item->szName); + mir_snprintf(szError, Translate("The service %s specified by the %s button definition was not found. You may need to install additional plugins."), item->szService, item->szName); MessageBoxA(0, szError, Translate("Service failure"), MB_OK); } break; @@ -1669,7 +1669,7 @@ buttons_done: if (status >= ID_STATUS_CONNECTING && status < ID_STATUS_OFFLINE) { char szBuffer[128]; - mir_snprintf(szBuffer, _countof(szBuffer), "%s_conn", pd->RealName); + mir_snprintf(szBuffer, "%s_conn", pd->RealName); hIcon = IcoLib_GetIcon(szBuffer); } else if (cfg::dat.bShowXStatusOnSbar && status > ID_STATUS_OFFLINE) { diff --git a/plugins/Clist_nicer/src/cluiframes.cpp b/plugins/Clist_nicer/src/cluiframes.cpp index bbf7b4f8e0..2e42ddf769 100644 --- a/plugins/Clist_nicer/src/cluiframes.cpp +++ b/plugins/Clist_nicer/src/cluiframes.cpp @@ -468,7 +468,7 @@ int LocateStorePosition(int Frameid, int maxstored) for (int i = 0; i < maxstored; i++) { char settingname[255]; - mir_snprintf(settingname, _countof(settingname), "Name%d", i); + mir_snprintf(settingname, "Name%d", i); ptrT frmname(db_get_tsa(0, CLUIFrameModule, settingname)); if (frmname == NULL) continue; if (mir_tstrcmpi(frmname, Frames[Frameid].name) == 0) @@ -2445,7 +2445,7 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA if (pos != -1) { int oldflags; char TBcapt[255]; - mir_snprintf(TBcapt, _countof(TBcapt), "%s - h:%d, vis:%d, fl:%d, fl:(%d,%d,%d,%d),or: %d", + mir_snprintf(TBcapt, "%s - h:%d, vis:%d, fl:%d, fl:(%d,%d,%d,%d),or: %d", Frames[pos].name, Frames[pos].height, Frames[pos].visible, Frames[pos].floating, Frames[pos].FloatingPos.x, Frames[pos].FloatingPos.y, Frames[pos].FloatingSize.x, Frames[pos].FloatingSize.y, @@ -2929,7 +2929,7 @@ TCHAR g_ptszEventName[100]; static int CLUIFrameOnModulesLoad(WPARAM, LPARAM) { - mir_sntprintf(g_ptszEventName, _countof(g_ptszEventName), _T("mf_update_evt_%d"), GetCurrentThreadId()); + mir_sntprintf(g_ptszEventName, _T("mf_update_evt_%d"), GetCurrentThreadId()); g_hEventThread = CreateEvent(NULL, TRUE, FALSE, g_ptszEventName); hThreadMFUpdate = mir_forkthread(MF_UpdateThread, NULL); SetThreadPriority(hThreadMFUpdate, THREAD_PRIORITY_IDLE); diff --git a/plugins/Clist_nicer/src/cluiservices.cpp b/plugins/Clist_nicer/src/cluiservices.cpp index e5e059f787..ccdb98ccc4 100644 --- a/plugins/Clist_nicer/src/cluiservices.cpp +++ b/plugins/Clist_nicer/src/cluiservices.cpp @@ -33,7 +33,7 @@ static INT_PTR GetClistVersion(WPARAM, LPARAM lParam) { static char g_szVersionString[256]; - mir_snprintf(g_szVersionString, _countof(g_szVersionString), "%s, %d.%d.%d.%d", pluginInfo.shortName, HIBYTE(HIWORD(pluginInfo.version)), LOBYTE(HIWORD(pluginInfo.version)), HIBYTE(LOWORD(pluginInfo.version)), LOBYTE(LOBYTE(pluginInfo.version))); + mir_snprintf(g_szVersionString, "%s, %d.%d.%d.%d", pluginInfo.shortName, HIBYTE(HIWORD(pluginInfo.version)), LOBYTE(HIWORD(pluginInfo.version)), HIBYTE(LOWORD(pluginInfo.version)), LOBYTE(LOBYTE(pluginInfo.version))); if (!IsBadWritePtr((LPVOID)lParam, 4)) *((DWORD *)lParam) = pluginInfo.version; diff --git a/plugins/Clist_nicer/src/config.cpp b/plugins/Clist_nicer/src/config.cpp index 48486e1456..0cf73d44aa 100644 --- a/plugins/Clist_nicer/src/config.cpp +++ b/plugins/Clist_nicer/src/config.cpp @@ -253,13 +253,13 @@ INT_PTR CALLBACK API::Ex_DlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM) case WM_INITDIALOG: { char szBuffer[2048]; #ifdef _WIN64 - mir_snprintf(szBuffer, _countof(szBuffer), + mir_snprintf(szBuffer, "Exception %16.16X at address %16.16X occured in %s at line %d.\r\n\r\nEAX=%16.16X EBX=%16.16X ECX=%16.16X\r\nEDX=%16.16X ESI=%16.16X EDI=%16.16X\r\nEBP=%16.16X ESP=%16.16X EIP=%16.16X", exRecord.ExceptionCode, exRecord.ExceptionAddress, exSzFile, exLine, exCtx.Rax, exCtx.Rbx, exCtx.Rcx, exCtx.Rdx, exCtx.Rsi, exCtx.Rdi, exCtx.Rbp, exCtx.Rsp, exCtx.Rip); #else - mir_snprintf(szBuffer, _countof(szBuffer), + mir_snprintf(szBuffer, "Exception %8.8X at address %8.8X occured in %s at line %d.\r\n\r\nEAX=%8.8X EBX=%8.8X ECX=%8.8X\r\nEDX=%8.8X ESI=%8.8X EDI=%8.8X\r\nEBP=%8.8X ESP=%8.8X EIP=%8.8X", exRecord.ExceptionCode, exRecord.ExceptionAddress, exSzFile, exLine, exCtx.Eax,exCtx.Ebx, exCtx.Ecx, exCtx.Edx, @@ -303,8 +303,8 @@ int API::Ex_ShowDialog(EXCEPTION_POINTERS *ep, const char *szFile, int line, TCH memcpy(&exRecord, ep->ExceptionRecord, sizeof(EXCEPTION_RECORD)); memcpy(&exCtx, ep->ContextRecord, sizeof(CONTEXT)); - mir_snprintf(exSzFile, _countof(exSzFile), "%s%s", szName, szExt); - mir_sntprintf(exReason, _countof(exReason), _T("An application error has occured: %s"), szReason); + mir_snprintf(exSzFile, "%s%s", szName, szExt); + mir_sntprintf(exReason, _T("An application error has occured: %s"), szReason); exLine = line; exLastResult = DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_EXCEPTION), 0, Ex_DlgProc, 0); exAllowContinue = fAllowContinue; @@ -370,7 +370,7 @@ void CRTException::display() const TCHAR *tszMsg = mir_a2t(what()); TCHAR tszBoxMsg[500]; - mir_sntprintf(tszBoxMsg, _countof(tszBoxMsg), _T("%s\n\n(%s)"), tszMsg, m_szParam); + mir_sntprintf(tszBoxMsg, _T("%s\n\n(%s)"), tszMsg, m_szParam); ::MessageBox(0, tszBoxMsg, _T("Clist_nicer runtime error"), MB_OK | MB_ICONERROR); mir_free(tszMsg); } diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp index aad2b8689c..27d3b837ed 100644 --- a/plugins/Clist_nicer/src/extBackg.cpp +++ b/plugins/Clist_nicer/src/extBackg.cpp @@ -287,9 +287,9 @@ void LoadExtBkSettingsFromDB() *p = _StatusItems[0]; ID_EXTBK_LAST++; - mir_snprintf(p->szDBname, _countof(p->szDBname), "EXBK_%s", accs[i]->szModuleName); + mir_snprintf(p->szDBname, "EXBK_%s", accs[i]->szModuleName); if (i == 0) - mir_snprintf(p->szName, _countof(p->szName), "{-}%s", accs[i]->szModuleName); + mir_snprintf(p->szName, "{-}%s", accs[i]->szModuleName); else strncpy_s(p->szName, accs[i]->szModuleName, _TRUNCATE); p->statusID = ID_EXTBK_LAST; @@ -487,34 +487,34 @@ void extbk_export(char *file) } for (n = 0; n <= FONTID_LAST; n++) { - mir_snprintf(szSection, _countof(szSection), "Font%d", n); + mir_snprintf(szSection, "Font%d", n); - mir_snprintf(szKey, _countof(szKey), "Font%dName", n); + mir_snprintf(szKey, "Font%dName", n); if (!cfg::getString(NULL, "CLC", szKey, &dbv)) { WritePrivateProfileStringA(szSection, "Name", dbv.pszVal, file); mir_free(dbv.pszVal); } - mir_snprintf(szKey, _countof(szKey), "Font%dSize", n); + mir_snprintf(szKey, "Font%dSize", n); data = (DWORD)cfg::getByte("CLC", szKey, 8); WritePrivateProfileStructA(szSection, "Size", &data, 1, file); - mir_snprintf(szKey, _countof(szKey), "Font%dSty", n); + mir_snprintf(szKey, "Font%dSty", n); data = (DWORD)cfg::getByte("CLC", szKey, 8); WritePrivateProfileStructA(szSection, "Style", &data, 1, file); - mir_snprintf(szKey, _countof(szKey), "Font%dSet", n); + mir_snprintf(szKey, "Font%dSet", n); data = (DWORD)cfg::getByte("CLC", szKey, 8); WritePrivateProfileStructA(szSection, "Set", &data, 1, file); - mir_snprintf(szKey, _countof(szKey), "Font%dCol", n); + mir_snprintf(szKey, "Font%dCol", n); data = cfg::getDword("CLC", szKey, 8); WritePrivateProfileStructA(szSection, "Color", &data, 4, file); - mir_snprintf(szKey, _countof(szKey), "Font%dFlags", n); + mir_snprintf(szKey, "Font%dFlags", n); data = (DWORD)cfg::getDword("CLC", szKey, 8); WritePrivateProfileStructA(szSection, "Flags", &data, 4, file); - mir_snprintf(szKey, _countof(szKey), "Font%dAs", n); + mir_snprintf(szKey, "Font%dAs", n); data = (DWORD)cfg::getWord("CLC", szKey, 8); WritePrivateProfileStructA(szSection, "SameAs", &data, 2, file); } @@ -555,7 +555,7 @@ DWORD __fastcall HexStringToLong(const char *szSource) static StatusItems_t default_item = { "{--Contact--}", "", 0, CLCDEFAULT_GRADIENT, CLCDEFAULT_CORNER, - CLCDEFAULT_COLOR, CLCDEFAULT_COLOR2, CLCDEFAULT_COLOR2_TRANSPARENT, -1, + CLCDEFAULT_COLOR, CLCDEFAULT_COLOR2, CLCDEFAULT_COLOR2_TRANSPARENT, DWORD(-1), CLCDEFAULT_ALPHA, CLCDEFAULT_MRGN_LEFT, CLCDEFAULT_MRGN_TOP, CLCDEFAULT_MRGN_RIGHT, CLCDEFAULT_MRGN_BOTTOM, CLCDEFAULT_IGNORE }; @@ -700,12 +700,12 @@ static void ReadItem(StatusItems_t *this_item, char *szItem, char *file) this_item->ALPHA = min(this_item->ALPHA, 100); clr = RGB(GetBValue(defaults->COLOR), GetGValue(defaults->COLOR), GetRValue(defaults->COLOR)); - mir_snprintf(def_color, _countof(def_color), "%6.6x", clr); + mir_snprintf(def_color, "%6.6x", clr); GetPrivateProfileStringA(szItem, "Color1", def_color, buffer, 400, file); this_item->COLOR = HexStringToLong(buffer); clr = RGB(GetBValue(defaults->COLOR2), GetGValue(defaults->COLOR2), GetRValue(defaults->COLOR2)); - mir_snprintf(def_color, _countof(def_color), "%6.6x", clr); + mir_snprintf(def_color, "%6.6x", clr); GetPrivateProfileStringA(szItem, "Color2", def_color, buffer, 400, file); this_item->COLOR2 = HexStringToLong(buffer); @@ -777,7 +777,7 @@ done_with_glyph: strncpy(tmpItem.szName, &itemname[1], sizeof(tmpItem.szName)); tmpItem.szName[sizeof(tmpItem.szName) - 1] = 0; _splitpath(szFileName, szDrive, szPath, NULL, NULL); - mir_snprintf(szFinalName, _countof(szFinalName), "%s\\%s\\%s", szDrive, szPath, buffer); + mir_snprintf(szFinalName, "%s\\%s\\%s", szDrive, szPath, buffer); tmpItem.alpha = GetPrivateProfileIntA(itemname, "Alpha", 100, szFileName); tmpItem.alpha = min(tmpItem.alpha, 100); tmpItem.alpha = (BYTE)((FLOAT)(((FLOAT)tmpItem.alpha) / 100) * 255); @@ -853,7 +853,7 @@ done_with_glyph: goto imgread_done; } for (n = 0;; n++) { - mir_snprintf(szItemNr, _countof(szItemNr), "Item%d", n); + mir_snprintf(szItemNr, "Item%d", n); GetPrivateProfileStringA(itemname, szItemNr, "None", buffer, 500, szFileName); if (!mir_strcmp(buffer, "None")) break; @@ -1274,7 +1274,7 @@ void LoadPerContactSkins(TCHAR *tszFileName) char UIN[40]; switch (dbv.type) { case DBVT_DWORD: - mir_snprintf(UIN, _countof(UIN), "%d", dbv.dVal); + mir_snprintf(UIN, "%d", dbv.dVal); break; case DBVT_ASCIIZ: strncpy_s(UIN, dbv.pszVal, _TRUNCATE); @@ -1363,38 +1363,38 @@ void extbk_import(char *file, HWND hwndDlg) GetPrivateProfileStructA("Global", "Version", &version, 4, file); if (version >= 2) { for (n = 0; n <= FONTID_LAST; n++) { - mir_snprintf(szSection, _countof(szSection), "Font%d", n); + mir_snprintf(szSection, "Font%d", n); - mir_snprintf(szKey, _countof(szKey), "Font%dName", n); + mir_snprintf(szKey, "Font%dName", n); GetPrivateProfileStringA(szSection, "Name", "Arial", buffer, sizeof(buffer), file); cfg::writeString(NULL, "CLC", szKey, buffer); - mir_snprintf(szKey, _countof(szKey), "Font%dSize", n); + mir_snprintf(szKey, "Font%dSize", n); data = 0; GetPrivateProfileStructA(szSection, "Size", &data, 1, file); cfg::writeByte("CLC", szKey, (BYTE)data); - mir_snprintf(szKey, _countof(szKey), "Font%dSty", n); + mir_snprintf(szKey, "Font%dSty", n); data = 0; GetPrivateProfileStructA(szSection, "Style", &data, 1, file); cfg::writeByte("CLC", szKey, (BYTE)data); - mir_snprintf(szKey, _countof(szKey), "Font%dSet", n); + mir_snprintf(szKey, "Font%dSet", n); data = 0; GetPrivateProfileStructA(szSection, "Set", &data, 1, file); cfg::writeByte("CLC", szKey, (BYTE)data); - mir_snprintf(szKey, _countof(szKey), "Font%dCol", n); + mir_snprintf(szKey, "Font%dCol", n); data = 0; GetPrivateProfileStructA(szSection, "Color", &data, 4, file); cfg::writeDword("CLC", szKey, data); - mir_snprintf(szKey, _countof(szKey), "Font%dFlags", n); + mir_snprintf(szKey, "Font%dFlags", n); data = 0; GetPrivateProfileStructA(szSection, "Flags", &data, 4, file); cfg::writeDword("CLC", szKey, (WORD)data); - mir_snprintf(szKey, _countof(szKey), "Font%dAs", n); + mir_snprintf(szKey, "Font%dAs", n); data = 0; GetPrivateProfileStructA(szSection, "SameAs", &data, 2, file); cfg::writeDword("CLC", szKey, (WORD)data); diff --git a/plugins/Clist_nicer/src/statusbar.cpp b/plugins/Clist_nicer/src/statusbar.cpp index 2aec05b640..22268a7df3 100644 --- a/plugins/Clist_nicer/src/statusbar.cpp +++ b/plugins/Clist_nicer/src/statusbar.cpp @@ -160,7 +160,7 @@ LRESULT CALLBACK NewStatusBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM BYTE isLocked = cfg::getByte(PD->RealName, "LockMainStatus", 0); TCHAR szTipText[256]; - mir_sntprintf(szTipText, _countof(szTipText), _T("%s: %s%s"), + mir_sntprintf(szTipText, _T("%s: %s%s"), PD->RealName, pcli->pfnGetStatusModeDescription(wStatus, 0), isLocked ? _T(" (LOCKED)") : _T("")); CLCINFOTIP ti = { sizeof(ti) }; diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp index 74107561e0..cb647b2923 100644 --- a/plugins/Clist_nicer/src/viewmodes.cpp +++ b/plugins/Clist_nicer/src/viewmodes.cpp @@ -481,7 +481,7 @@ void UpdateFilters() for (i = 0; i < ListView_GetItemCount(hwndList); i++) { item.iItem = i; SendMessageA(hwndList, LVM_GETITEMA, 0, (LPARAM)&item); - mir_snprintf(szMask, _countof(szMask), "%s|", szTemp); + mir_snprintf(szMask, "%s|", szTemp); if (dbv_pf.pszVal && strstr(dbv_pf.pszVal, szMask)) ListView_SetCheckState(hwndList, i, TRUE) else @@ -505,7 +505,7 @@ void UpdateFilters() for (i = 1; i < ListView_GetItemCount(hwndList); i++) { item.iItem = i; SendMessage(hwndList, LVM_GETITEM, 0, (LPARAM)&item); - mir_sntprintf(szMask, _countof(szMask), _T("%s|"), szTemp); + mir_sntprintf(szMask, _T("%s|"), szTemp); if (dbv_gf.ptszVal && _tcsstr(dbv_gf.ptszVal, szMask)) ListView_SetCheckState(hwndList, i, TRUE) else -- cgit v1.2.3