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/QuickReplies/src/events.cpp | 16 ++++++++-------- plugins/QuickReplies/src/options.cpp | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'plugins/QuickReplies/src') diff --git a/plugins/QuickReplies/src/events.cpp b/plugins/QuickReplies/src/events.cpp index 6cddb3322f..2935b52655 100644 --- a/plugins/QuickReplies/src/events.cpp +++ b/plugins/QuickReplies/src/events.cpp @@ -52,8 +52,8 @@ int OnModulesLoaded(WPARAM, LPARAM) Icon_Register(hInstance, "TabSRMM/Quick Replies", &icon, 1); char buttonNameTranslated[32], buttonName[32]; - mir_snprintf(buttonNameTranslated, _countof(buttonNameTranslated), "%s %x", Translate("Button"), iNumber + 1); - mir_snprintf(buttonName, _countof(buttonName), MODULE" %x", iNumber + 1); + mir_snprintf(buttonNameTranslated, "%s %x", Translate("Button"), iNumber + 1); + mir_snprintf(buttonName, MODULE" %x", iNumber + 1); BBButton bbd = {0}; bbd.cbSize = sizeof(BBButton); @@ -80,20 +80,20 @@ int OnButtonPressed(WPARAM wParam, LPARAM lParam) LIST replyList(1); CustomButtonClickData *cbcd = (CustomButtonClickData *)lParam; - mir_snprintf(buttonName, _countof(buttonName), MODULE" %x", iNumber + 1); + mir_snprintf(buttonName, MODULE" %x", iNumber + 1); if (mir_strcmp(cbcd->pszModule, buttonName)) return 0; if (cbcd->dwButtonId != iNumber) return 1; - mir_snprintf(key, _countof(key), "RepliesCount_%x", iNumber); + mir_snprintf(key, "RepliesCount_%x", iNumber); count = db_get_w(NULL, MODULE, key, 0); { if (count == 0 || cbcd->flags & BBCF_RIGHTBUTTON) { - mir_snprintf(buttonName, _countof(buttonName), "%s %x", Translate("Button"), iNumber + 1); + mir_snprintf(buttonName, "%s %x", Translate("Button"), iNumber + 1); OPENOPTIONSDIALOG ood = {0}; ood.cbSize = sizeof(ood); @@ -108,7 +108,7 @@ int OnButtonPressed(WPARAM wParam, LPARAM lParam) for (int i = 0; i < count; i++) { - mir_snprintf(key, _countof(key), "Reply_%x_%x", iNumber, i); + mir_snprintf(key, "Reply_%x_%x", iNumber, i); wchar_t *value = db_get_wsa(NULL, MODULE, key); if (!value) @@ -136,7 +136,7 @@ int OnButtonPressed(WPARAM wParam, LPARAM lParam) SendMessage(hEdit, EM_REPLACESEL, TRUE, (LPARAM)replyList[index - 1]); - mir_snprintf(key, _countof(key), "ImmediatelySend_%x", iNumber); + mir_snprintf(key, "ImmediatelySend_%x", iNumber); if ((BYTE)db_get_b(NULL, MODULE, key, 1) || cbcd->flags & BBCF_CONTROLPRESSED) SendMessage(cbcd->hwndFrom, WM_COMMAND, IDOK, 0); } @@ -155,7 +155,7 @@ int OnPreShutdown(WPARAM, LPARAM) if (ServiceExists(MS_BB_REMOVEBUTTON)) { char buttonName[32]; - mir_snprintf(buttonName, _countof(buttonName), MODULE" %x", iNumber + 1); + mir_snprintf(buttonName, MODULE" %x", iNumber + 1); BBButton bbd = {0}; bbd.cbSize = sizeof(BBButton); diff --git a/plugins/QuickReplies/src/options.cpp b/plugins/QuickReplies/src/options.cpp index 6a6f9d9417..a12a86ea19 100644 --- a/plugins/QuickReplies/src/options.cpp +++ b/plugins/QuickReplies/src/options.cpp @@ -71,15 +71,15 @@ INT_PTR CALLBACK DlgProcOptionsPage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR mir_subclassWindow(GetDlgItem(hwndDlg, IDC_REPLIES), MessageEditSubclassProc); - mir_snprintf(key, _countof(key), "ImmediatelySend_%x", iNumber); + mir_snprintf(key, "ImmediatelySend_%x", iNumber); CheckDlgButton(hwndDlg, IDC_IMMEDIATELY, db_get_w(NULL, MODULE, key, 1) ? BST_CHECKED : BST_UNCHECKED); - mir_snprintf(key, _countof(key), "RepliesCount_%x", iNumber); + mir_snprintf(key, "RepliesCount_%x", iNumber); count = db_get_w(NULL, MODULE, key, 0); for (int i = 0; i < count; i++) { - mir_snprintf(key, _countof(key), "Reply_%x_%x", iNumber, i); + mir_snprintf(key, "Reply_%x_%x", iNumber, i); wchar_t *value = db_get_wsa(NULL, MODULE, key); if (value) { @@ -117,12 +117,12 @@ INT_PTR CALLBACK DlgProcOptionsPage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR int count = 0; wchar_t *tszReplies; - mir_snprintf(key, _countof(key), "RepliesCount_%x", iNumber); + mir_snprintf(key, "RepliesCount_%x", iNumber); count = db_get_b(NULL, MODULE, key, 0); for (int i = 0; i < count; i++) { - mir_snprintf(key, _countof(key), "Reply_%x_%x", iNumber, i); + mir_snprintf(key, "Reply_%x_%x", iNumber, i); db_unset(NULL, MODULE, key); } @@ -139,17 +139,17 @@ INT_PTR CALLBACK DlgProcOptionsPage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR int pos = -1, prev = 0; while ((pos = replies.Find(_T("\r\n"), prev)) != -1) { - mir_snprintf(key, _countof(key), "Reply_%x_%x", iNumber, count++); + mir_snprintf(key, "Reply_%x_%x", iNumber, count++); db_set_ws(NULL, MODULE, key, replies.Mid(prev, pos - prev).GetBuffer()); prev = pos + 2; } } mir_free(tszReplies); - mir_snprintf(key, _countof(key), "RepliesCount_%x", iNumber); + mir_snprintf(key, "RepliesCount_%x", iNumber); db_set_w(NULL, MODULE, key, count); - mir_snprintf(key, _countof(key), "ImmediatelySend_%x", iNumber); + mir_snprintf(key, "ImmediatelySend_%x", iNumber); db_set_b(NULL, MODULE, key, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_IMMEDIATELY)); return TRUE; @@ -169,7 +169,7 @@ INT_PTR CALLBACK DlgProcOptionsPage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR int OnOptInitialized(WPARAM wParam, LPARAM) { char tabName[32]; - mir_snprintf(tabName, _countof(tabName), "%s %x", Translate("Button"), iNumber + 1); + mir_snprintf(tabName, "%s %x", Translate("Button"), iNumber + 1); OPTIONSDIALOGPAGE odp = { 0 }; odp.pszGroup = LPGEN("Message sessions"); -- cgit v1.2.3