From b7c74cd5b22618d544a3f4ae124985d4837e3a22 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 4 Jun 2015 22:12:13 +0000 Subject: new mir_snprintf templates without SIZEOF git-svn-id: http://svn.miranda-ng.org/main/trunk@14002 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Popup/src/opt_class.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/Popup/src/opt_class.cpp') diff --git a/plugins/Popup/src/opt_class.cpp b/plugins/Popup/src/opt_class.cpp index cb5e2c48f6..35bd585ed0 100644 --- a/plugins/Popup/src/opt_class.cpp +++ b/plugins/Popup/src/opt_class.cpp @@ -490,25 +490,25 @@ void LoadClassSettings(POPUPTREEDATA *ptd, char* szModul) char setting[2 * MAXMODULELABELLENGTH]; char *szTmp = NULL; - mir_snprintf(setting, SIZEOF(setting), "%s/enabled", ptd->pupClass.pszName); + mir_snprintf(setting, "%s/enabled", ptd->pupClass.pszName); ptd->enabled = (signed char)db_get_b(NULL, szModul, setting, TRUE); - mir_snprintf(setting, SIZEOF(setting), "%s/Timeout", ptd->pupClass.pszName); + mir_snprintf(setting, "%s/Timeout", ptd->pupClass.pszName); ptd->pupClass.iSeconds = (signed char)db_get_w(NULL, szModul, setting, 0); - mir_snprintf(setting, SIZEOF(setting), "%s/TimeoutVal", ptd->pupClass.pszName); + mir_snprintf(setting, "%s/TimeoutVal", ptd->pupClass.pszName); ptd->timeoutValue = (signed char)db_get_w(NULL, szModul, setting, ptd->pupClass.iSeconds ? ptd->pupClass.iSeconds : PopupOptions.Seconds); - mir_snprintf(setting, SIZEOF(setting), "%s/leftAction", ptd->pupClass.pszName); + mir_snprintf(setting, "%s/leftAction", ptd->pupClass.pszName); szTmp = db_get_s(NULL, szModul, setting, POPUP_ACTION_NOTHING); // standart ?? mir_strncpy(ptd->leftAction, szTmp, sizeof(ptd->leftAction)); mir_free(szTmp); szTmp = NULL; - mir_snprintf(setting, SIZEOF(setting), "%s/rightAction", ptd->pupClass.pszName); + mir_snprintf(setting, "%s/rightAction", ptd->pupClass.pszName); szTmp = db_get_s(NULL, szModul, setting, POPUP_ACTION_DISMISS); // standart ?? mir_strncpy(ptd->rightAction, szTmp, sizeof(ptd->rightAction)); mir_free(szTmp); szTmp = NULL; @@ -518,18 +518,18 @@ void SaveClassSettings(POPUPTREEDATA *ptd, char* szModul) { char setting[2 * MAXMODULELABELLENGTH]; - mir_snprintf(setting, SIZEOF(setting), "%s/enabled", ptd->pupClass.pszName); + mir_snprintf(setting, "%s/enabled", ptd->pupClass.pszName); db_set_b(NULL, szModul, setting, ptd->enabled); - mir_snprintf(setting, SIZEOF(setting), "%s/Timeout", ptd->pupClass.pszName); + mir_snprintf(setting, "%s/Timeout", ptd->pupClass.pszName); db_set_w(NULL, szModul, setting, ptd->pupClass.iSeconds); - mir_snprintf(setting, SIZEOF(setting), "%s/TimeoutVal", ptd->pupClass.pszName); + mir_snprintf(setting, "%s/TimeoutVal", ptd->pupClass.pszName); db_set_w(NULL, szModul, setting, ptd->timeoutValue); - mir_snprintf(setting, SIZEOF(setting), "%s/leftAction", ptd->pupClass.pszName); + mir_snprintf(setting, "%s/leftAction", ptd->pupClass.pszName); db_set_s(NULL, szModul, setting, ptd->leftAction); - mir_snprintf(setting, SIZEOF(setting), "%s/rightAction", ptd->pupClass.pszName); + mir_snprintf(setting, "%s/rightAction", ptd->pupClass.pszName); db_set_s(NULL, szModul, setting, ptd->rightAction); } -- cgit v1.2.3