From 13eb83bea655c3302c74a82d826d75bceb9232a2 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Mon, 8 Dec 2014 22:13:57 +0000 Subject: code cleanup around mir_snprintf git-svn-id: http://svn.miranda-ng.org/main/trunk@11285 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/src/clistmod.cpp | 2 +- plugins/Clist_nicer/src/cluiservices.cpp | 2 +- plugins/Clist_nicer/src/config.cpp | 4 +-- plugins/Clist_nicer/src/extBackg.cpp | 48 +++++++++++++++--------------- plugins/Clist_nicer/src/init.cpp | 2 +- plugins/Clist_nicer/src/viewmodes.cpp | 50 ++++++++++++++++---------------- 6 files changed, 54 insertions(+), 54 deletions(-) (limited to 'plugins/Clist_nicer') diff --git a/plugins/Clist_nicer/src/clistmod.cpp b/plugins/Clist_nicer/src/clistmod.cpp index 1ee7074df1..897f6cfc00 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, 128, "%s_conn", szProto); + mir_snprintf(szBuf, SIZEOF(szBuf), "%s_conn", szProto); *phIcon = Skin_GetIcon(szBuf); } } diff --git a/plugins/Clist_nicer/src/cluiservices.cpp b/plugins/Clist_nicer/src/cluiservices.cpp index 832a308d4f..cf9e441f5f 100644 --- a/plugins/Clist_nicer/src/cluiservices.cpp +++ b/plugins/Clist_nicer/src/cluiservices.cpp @@ -33,7 +33,7 @@ static INT_PTR GetClistVersion(WPARAM wParam, LPARAM lParam) { static char g_szVersionString[256]; - mir_snprintf(g_szVersionString, 256, "%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, SIZEOF(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 5cda86fb36..6351448c3c 100644 --- a/plugins/Clist_nicer/src/config.cpp +++ b/plugins/Clist_nicer/src/config.cpp @@ -311,8 +311,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, MAX_PATH, "%s%s", szName, szExt); - mir_sntprintf(exReason, 256, _T("An application error has occured: %s"), szReason); + mir_snprintf(exSzFile, SIZEOF(exSzFile), "%s%s", szName, szExt); + mir_sntprintf(exReason, SIZEOF(exReason), _T("An application error has occured: %s"), szReason); exLine = line; exLastResult = DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_EXCEPTION), 0, Ex_DlgProc, 0); exAllowContinue = fAllowContinue; diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp index 74e848468d..5dca791388 100644 --- a/plugins/Clist_nicer/src/extBackg.cpp +++ b/plugins/Clist_nicer/src/extBackg.cpp @@ -287,12 +287,12 @@ void LoadExtBkSettingsFromDB() *p = _StatusItems[0]; ID_EXTBK_LAST++; - mir_snprintf(p->szDBname, 30, "EXBK_%s", accs[i]->szModuleName); + mir_snprintf(p->szDBname, SIZEOF(p->szDBname), "EXBK_%s", accs[i]->szModuleName); if (i == 0) { - mir_strncpy(p->szName, "{-}", 30); - strncat(p->szName, accs[i]->szModuleName, 30); + mir_strncpy(p->szName, "{-}", SIZEOF(p->szName)); + strncat(p->szName, accs[i]->szModuleName, SIZEOF(p->szName)); } - else mir_strncpy(p->szName, accs[i]->szModuleName, 30); + else mir_strncpy(p->szName, accs[i]->szModuleName, SIZEOF(p->szName)); p->statusID = ID_EXTBK_LAST; arStatusItems.insert(p); } @@ -487,34 +487,34 @@ void extbk_export(char *file) } for (n = 0; n <= FONTID_LAST; n++) { - mir_snprintf(szSection, 255, "Font%d", n); + mir_snprintf(szSection, SIZEOF(szSection), "Font%d", n); - mir_snprintf(szKey, 255, "Font%dName", n); + mir_snprintf(szKey, SIZEOF(szKey), "Font%dName", n); if (!cfg::getString(NULL, "CLC", szKey, &dbv)) { WritePrivateProfileStringA(szSection, "Name", dbv.pszVal, file); mir_free(dbv.pszVal); } - mir_snprintf(szKey, 255, "Font%dSize", n); + mir_snprintf(szKey, SIZEOF(szKey), "Font%dSize", n); data = (DWORD)cfg::getByte("CLC", szKey, 8); WritePrivateProfileStructA(szSection, "Size", &data, 1, file); - mir_snprintf(szKey, 255, "Font%dSty", n); + mir_snprintf(szKey, SIZEOF(szKey), "Font%dSty", n); data = (DWORD)cfg::getByte("CLC", szKey, 8); WritePrivateProfileStructA(szSection, "Style", &data, 1, file); - mir_snprintf(szKey, 255, "Font%dSet", n); + mir_snprintf(szKey, SIZEOF(szKey), "Font%dSet", n); data = (DWORD)cfg::getByte("CLC", szKey, 8); WritePrivateProfileStructA(szSection, "Set", &data, 1, file); - mir_snprintf(szKey, 255, "Font%dCol", n); + mir_snprintf(szKey, SIZEOF(szKey), "Font%dCol", n); data = cfg::getDword("CLC", szKey, 8); WritePrivateProfileStructA(szSection, "Color", &data, 4, file); - mir_snprintf(szKey, 255, "Font%dFlags", n); + mir_snprintf(szKey, SIZEOF(szKey), "Font%dFlags", n); data = (DWORD)cfg::getDword("CLC", szKey, 8); WritePrivateProfileStructA(szSection, "Flags", &data, 4, file); - mir_snprintf(szKey, 255, "Font%dAs", n); + mir_snprintf(szKey, SIZEOF(szKey), "Font%dAs", n); data = (DWORD)cfg::getWord("CLC", szKey, 8); WritePrivateProfileStructA(szSection, "SameAs", &data, 2, file); } @@ -713,12 +713,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, 15, "%6.6x", clr); + mir_snprintf(def_color, SIZEOF(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, 15, "%6.6x", clr); + mir_snprintf(def_color, SIZEOF(def_color), "%6.6x", clr); GetPrivateProfileStringA(szItem, "Color2", def_color, buffer, 400, file); this_item->COLOR2 = HexStringToLong(buffer); @@ -790,7 +790,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, MAX_PATH, "%s\\%s\\%s", szDrive, szPath, buffer); + mir_snprintf(szFinalName, SIZEOF(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); @@ -868,7 +868,7 @@ done_with_glyph: goto imgread_done; } for (n = 0; ; n++) { - mir_snprintf(szItemNr, 30, "Item%d", n); + mir_snprintf(szItemNr, SIZEOF(szItemNr), "Item%d", n); GetPrivateProfileStringA(itemname, szItemNr, "None", buffer, 500, szFileName); if (!strcmp(buffer, "None")) break; @@ -1365,38 +1365,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, 255, "Font%d", n); + mir_snprintf(szSection, SIZEOF(szSection), "Font%d", n); - mir_snprintf(szKey, 255, "Font%dName", n); + mir_snprintf(szKey, SIZEOF(szKey), "Font%dName", n); GetPrivateProfileStringA(szSection, "Name", "Arial", buffer, sizeof(buffer), file); cfg::writeString(NULL, "CLC", szKey, buffer); - mir_snprintf(szKey, 255, "Font%dSize", n); + mir_snprintf(szKey, SIZEOF(szKey), "Font%dSize", n); data = 0; GetPrivateProfileStructA(szSection, "Size", &data, 1, file); cfg::writeByte("CLC", szKey, (BYTE)data); - mir_snprintf(szKey, 255, "Font%dSty", n); + mir_snprintf(szKey, SIZEOF(szKey), "Font%dSty", n); data = 0; GetPrivateProfileStructA(szSection, "Style", &data, 1, file); cfg::writeByte("CLC", szKey, (BYTE)data); - mir_snprintf(szKey, 255, "Font%dSet", n); + mir_snprintf(szKey, SIZEOF(szKey), "Font%dSet", n); data = 0; GetPrivateProfileStructA(szSection, "Set", &data, 1, file); cfg::writeByte("CLC", szKey, (BYTE)data); - mir_snprintf(szKey, 255, "Font%dCol", n); + mir_snprintf(szKey, SIZEOF(szKey), "Font%dCol", n); data = 0; GetPrivateProfileStructA(szSection, "Color", &data, 4, file); cfg::writeDword("CLC", szKey, data); - mir_snprintf(szKey, 255, "Font%dFlags", n); + mir_snprintf(szKey, SIZEOF(szKey), "Font%dFlags", n); data = 0; GetPrivateProfileStructA(szSection, "Flags", &data, 4, file); cfg::writeDword("CLC", szKey, (WORD)data); - mir_snprintf(szKey, 255, "Font%dAs", n); + mir_snprintf(szKey, SIZEOF(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/init.cpp b/plugins/Clist_nicer/src/init.cpp index d9b664c1ee..8e7ea1f6c1 100644 --- a/plugins/Clist_nicer/src/init.cpp +++ b/plugins/Clist_nicer/src/init.cpp @@ -116,7 +116,7 @@ void _DebugTraceA(const char *fmt, ...) FILE *f; CallService(MS_DB_GETPROFILEPATH, MAX_PATH, (LPARAM)szDataPath); - mir_snprintf(szLogFileName, MAX_PATH, "%s\\%s", szDataPath, "clist_nicer.log"); + mir_snprintf(szLogFileName, SIZEOF(szLogFileName), "%s\\%s", szDataPath, "clist_nicer.log"); f = fopen(szLogFileName, "a+"); if (f) { fputs(debug, f); diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp index 4d8eb05820..714d8447da 100644 --- a/plugins/Clist_nicer/src/viewmodes.cpp +++ b/plugins/Clist_nicer/src/viewmodes.cpp @@ -302,17 +302,17 @@ void SaveViewMode(const char *name, const TCHAR *szGroupFilter, const char *szPr { char szSetting[512]; - mir_snprintf(szSetting, 512, "%c%s_PF", 246, name); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_PF", 246, name); cfg::writeString(NULL, CLVM_MODULE, szSetting, szProtoFilter); - mir_snprintf(szSetting, 512, "%c%s_GF", 246, name); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_GF", 246, name); cfg::writeTString(NULL, CLVM_MODULE, szSetting, szGroupFilter); - mir_snprintf(szSetting, 512, "%c%s_SM", 246, name); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_SM", 246, name); cfg::writeDword(CLVM_MODULE, szSetting, statusMask); - mir_snprintf(szSetting, 512, "%c%s_SSM", 246, name); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_SSM", 246, name); cfg::writeDword(CLVM_MODULE, szSetting, stickyStatusMask); - mir_snprintf(szSetting, 512, "%c%s_OPT", 246, name); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_OPT", 246, name); cfg::writeDword(CLVM_MODULE, szSetting, options); - mir_snprintf(szSetting, 512, "%c%s_LM", 246, name); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_LM", 246, name); cfg::writeDword(CLVM_MODULE, szSetting, lmdat); cfg::writeDword(CLVM_MODULE, name, MAKELONG((unsigned short)operators, (unsigned short)stickies)); @@ -449,21 +449,21 @@ void UpdateFilters() SendDlgItemMessageA(clvmHwnd, IDC_VIEWMODES, LB_GETTEXT, clvm_curItem, (LPARAM)szBuf); strncpy(g_szModename, szBuf, sizeof(g_szModename)); g_szModename[sizeof(g_szModename) - 1] = 0; - mir_snprintf(szTemp, 100, Translate("Current view mode: %s"), g_szModename); + mir_snprintf(szTemp, SIZEOF(szTemp), Translate("Current view mode: %s"), g_szModename); SetDlgItemTextA(clvmHwnd, IDC_CURVIEWMODE2, szTemp); - mir_snprintf(szSetting, 128, "%c%s_PF", 246, szBuf); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_PF", 246, szBuf); if (db_get(NULL, CLVM_MODULE, szSetting, &dbv_pf)) goto cleanup; - mir_snprintf(szSetting, 128, "%c%s_GF", 246, szBuf); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_GF", 246, szBuf); if (cfg::getTString(NULL, CLVM_MODULE, szSetting, &dbv_gf)) goto cleanup; - mir_snprintf(szSetting, 128, "%c%s_OPT", 246, szBuf); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_OPT", 246, szBuf); if ((opt = cfg::getDword(NULL, CLVM_MODULE, szSetting, -1)) != -1) { SendDlgItemMessage(clvmHwnd, IDC_AUTOCLEARSPIN, UDM_SETPOS, 0, MAKELONG(LOWORD(opt), 0)); } - mir_snprintf(szSetting, 128, "%c%s_SM", 246, szBuf); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_SM", 246, szBuf); statusMask = cfg::getDword(CLVM_MODULE, szSetting, -1); - mir_snprintf(szSetting, 128, "%c%s_SSM", 246, szBuf); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_SSM", 246, szBuf); stickyStatusMask = cfg::getDword(CLVM_MODULE, szSetting, -1); dwFlags = cfg::getDword(CLVM_MODULE, szBuf, 0); { @@ -480,7 +480,7 @@ void UpdateFilters() for (i = 0; i < ListView_GetItemCount(hwndList); i++) { item.iItem = i; SendMessageA(hwndList, LVM_GETITEMA, 0, (LPARAM)&item); - mir_snprintf(szMask, 256, "%s|", szTemp); + mir_snprintf(szMask, SIZEOF(szMask), "%s|", szTemp); if (dbv_pf.pszVal && strstr(dbv_pf.pszVal, szMask)) ListView_SetCheckState(hwndList, i, TRUE) else @@ -538,7 +538,7 @@ void UpdateFilters() Utils::enableDlgControl(clvmHwnd, IDC_LASTMSGVALUE, useLastMsg); Utils::enableDlgControl(clvmHwnd, IDC_LASTMESSAGEUNIT, useLastMsg); - mir_snprintf(szSetting, 128, "%c%s_LM", 246, szBuf); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_LM", 246, szBuf); lmdat = cfg::getDword(CLVM_MODULE, szSetting, 0); SetDlgItemInt(clvmHwnd, IDC_LASTMSGVALUE, LOWORD(lmdat), FALSE); @@ -652,15 +652,15 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP char *szBuf = (char*)malloc(iLen + 1); if (szBuf) { SendDlgItemMessageA(hwndDlg, IDC_VIEWMODES, LB_GETTEXT, SendDlgItemMessage(hwndDlg, IDC_VIEWMODES, LB_GETCURSEL, 0, 0), (LPARAM)szBuf); - mir_snprintf(szSetting, 256, "%c%s_PF", 246, szBuf); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_PF", 246, szBuf); db_unset(NULL, CLVM_MODULE, szSetting); - mir_snprintf(szSetting, 256, "%c%s_GF", 246, szBuf); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_GF", 246, szBuf); db_unset(NULL, CLVM_MODULE, szSetting); - mir_snprintf(szSetting, 256, "%c%s_SM", 246, szBuf); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_SM", 246, szBuf); db_unset(NULL, CLVM_MODULE, szSetting); - mir_snprintf(szSetting, 256, "%c%s_VA", 246, szBuf); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_VA", 246, szBuf); db_unset(NULL, CLVM_MODULE, szSetting); - mir_snprintf(szSetting, 256, "%c%s_SSM", 246, szBuf); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_SSM", 246, szBuf); db_unset(NULL, CLVM_MODULE, szSetting); db_unset(NULL, CLVM_MODULE, szBuf); if (!strcmp(cfg::dat.current_viewmode, szBuf) && mir_strlen(szBuf) == mir_strlen(cfg::dat.current_viewmode)) { @@ -1048,7 +1048,7 @@ void ApplyViewMode(const char *name) cfg::dat.bFilterEffective = 0; - mir_snprintf(szSetting, 256, "%c%s_PF", 246, name); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_PF", 246, name); if (!cfg::getString(NULL, CLVM_MODULE, szSetting, &dbv)) { if (mir_strlen(dbv.pszVal) >= 2) { strncpy(cfg::dat.protoFilter, dbv.pszVal, sizeof(cfg::dat.protoFilter)); @@ -1057,7 +1057,7 @@ void ApplyViewMode(const char *name) } mir_free(dbv.pszVal); } - mir_snprintf(szSetting, 256, "%c%s_GF", 246, name); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_GF", 246, name); if (!cfg::getTString(NULL, CLVM_MODULE, szSetting, &dbv)) { if (mir_tstrlen(dbv.ptszVal) >= 2) { _tcsncpy(cfg::dat.groupFilter, dbv.ptszVal, SIZEOF(cfg::dat.groupFilter)); @@ -1066,12 +1066,12 @@ void ApplyViewMode(const char *name) } mir_free(dbv.ptszVal); } - mir_snprintf(szSetting, 256, "%c%s_SM", 246, name); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_SM", 246, name); cfg::dat.statusMaskFilter = cfg::getDword(CLVM_MODULE, szSetting, -1); if (cfg::dat.statusMaskFilter >= 1) cfg::dat.bFilterEffective |= CLVM_FILTER_STATUS; - mir_snprintf(szSetting, 256, "%c%s_SSM", 246, name); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_SSM", 246, name); cfg::dat.stickyMaskFilter = cfg::getDword(CLVM_MODULE, szSetting, -1); if (cfg::dat.stickyMaskFilter != -1) cfg::dat.bFilterEffective |= CLVM_FILTER_STICKYSTATUS; @@ -1082,7 +1082,7 @@ void ApplyViewMode(const char *name) if (cfg::dat.filterFlags & CLVM_AUTOCLEAR) { DWORD timerexpire; - mir_snprintf(szSetting, 256, "%c%s_OPT", 246, name); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_OPT", 246, name); timerexpire = LOWORD(cfg::getDword(CLVM_MODULE, szSetting, 0)); strncpy(cfg::dat.old_viewmode, cfg::dat.current_viewmode, 256); cfg::dat.old_viewmode[255] = 0; @@ -1103,7 +1103,7 @@ void ApplyViewMode(const char *name) cfg::dat.sortOrder[0] = bSaved; cfg::dat.bFilterEffective |= CLVM_FILTER_LASTMSG; - mir_snprintf(szSetting, 256, "%c%s_LM", 246, name); + mir_snprintf(szSetting, SIZEOF(szSetting), "%c%s_LM", 246, name); cfg::dat.lastMsgFilter = cfg::getDword(CLVM_MODULE, szSetting, 0); if (LOBYTE(HIWORD(cfg::dat.lastMsgFilter))) cfg::dat.bFilterEffective |= CLVM_FILTER_LASTMSG_NEWERTHAN; -- cgit v1.2.3