From 41a7300678e4bb3cd703e2c236e57af4a31962c7 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Mon, 1 Dec 2014 04:50:22 +0000 Subject: mir_snprintf(..., sizeof() -> SIZEOF(), ...) small fixs cleanups git-svn-id: http://svn.miranda-ng.org/main/trunk@11188 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp | 12 ++++++------ plugins/StatusPlugins/AdvancedAutoAway/options.cpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'plugins/StatusPlugins/AdvancedAutoAway') diff --git a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp index 33b130e1e7..5e08e14a20 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp @@ -141,13 +141,13 @@ void LoadOptions(TAAAProtoSettingList &loadSettings, BOOL override) int LoadAutoAwaySetting(TAAAProtoSetting &autoAwaySetting, char* protoName) { char setting[128]; - mir_snprintf(setting, sizeof(setting), "%s_OptionFlags", protoName); + mir_snprintf(setting, SIZEOF(setting), "%s_OptionFlags", protoName); autoAwaySetting.optionFlags = db_get_w(NULL, MODULENAME, setting, FLAG_LV2ONINACTIVE | FLAG_RESET); - mir_snprintf(setting, sizeof(setting), "%s_AwayTime", protoName); + mir_snprintf(setting, SIZEOF(setting), "%s_AwayTime", protoName); autoAwaySetting.awayTime = db_get_w(NULL, MODULENAME, setting, SETTING_AWAYTIME_DEFAULT); - mir_snprintf(setting, sizeof(setting), "%s_NATime", protoName); + mir_snprintf(setting, SIZEOF(setting), "%s_NATime", protoName); autoAwaySetting.naTime = db_get_w(NULL, MODULENAME, setting, SETTING_NATIME_DEFAULT); - mir_snprintf(setting, sizeof(setting), "%s_StatusFlags", protoName); + mir_snprintf(setting, SIZEOF(setting), "%s_StatusFlags", protoName); autoAwaySetting.statusFlags = db_get_w(NULL, MODULENAME, setting, StatusModeToProtoFlag(ID_STATUS_ONLINE) | StatusModeToProtoFlag(ID_STATUS_FREECHAT)); int flags; @@ -155,9 +155,9 @@ int LoadAutoAwaySetting(TAAAProtoSetting &autoAwaySetting, char* protoName) flags = 0xFFFFFF; else flags = CallProtoService(protoName, PS_GETCAPS, PFLAGNUM_2, 0)&~CallProtoService(protoName, PS_GETCAPS, (WPARAM)PFLAGNUM_5, 0); - mir_snprintf(setting, sizeof(setting), "%s_Lv1Status", protoName); + mir_snprintf(setting, SIZEOF(setting), "%s_Lv1Status", protoName); autoAwaySetting.lv1Status = db_get_w(NULL, MODULENAME, setting, (flags&StatusModeToProtoFlag(ID_STATUS_AWAY)) ? ID_STATUS_AWAY : ID_STATUS_OFFLINE); - mir_snprintf(setting, sizeof(setting), "%s_Lv2Status", protoName); + mir_snprintf(setting, SIZEOF(setting), "%s_Lv2Status", protoName); autoAwaySetting.lv2Status = db_get_w(NULL, MODULENAME, setting, (flags&StatusModeToProtoFlag(ID_STATUS_NA)) ? ID_STATUS_NA : ID_STATUS_OFFLINE); return 0; diff --git a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp index c4d58d1747..97c5bf9675 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp @@ -34,17 +34,17 @@ static BOOL bSettingSame = FALSE; static int WriteAutoAwaySetting(TAAAProtoSetting &autoAwaySetting, char *protoName) { char setting[128]; - mir_snprintf(setting, sizeof(setting), "%s_OptionFlags", protoName); + mir_snprintf(setting, SIZEOF(setting), "%s_OptionFlags", protoName); db_set_w(NULL, MODULENAME, setting, (WORD)autoAwaySetting.optionFlags); - mir_snprintf(setting, sizeof(setting), "%s_AwayTime", protoName); + mir_snprintf(setting, SIZEOF(setting), "%s_AwayTime", protoName); db_set_w(NULL, MODULENAME, setting, (WORD)autoAwaySetting.awayTime); - mir_snprintf(setting, sizeof(setting), "%s_NATime", protoName); + mir_snprintf(setting, SIZEOF(setting), "%s_NATime", protoName); db_set_w(NULL, MODULENAME, setting, (WORD)autoAwaySetting.naTime); - mir_snprintf(setting, sizeof(setting), "%s_StatusFlags", protoName); + mir_snprintf(setting, SIZEOF(setting), "%s_StatusFlags", protoName); db_set_w(NULL, MODULENAME, setting, (WORD)autoAwaySetting.statusFlags); - mir_snprintf(setting, sizeof(setting), "%s_Lv1Status", protoName); + mir_snprintf(setting, SIZEOF(setting), "%s_Lv1Status", protoName); db_set_w(NULL, MODULENAME, setting, (WORD)autoAwaySetting.lv1Status); - mir_snprintf(setting, sizeof(setting), "%s_Lv2Status", protoName); + mir_snprintf(setting, SIZEOF(setting), "%s_Lv2Status", protoName); db_set_w(NULL, MODULENAME, setting, (WORD)autoAwaySetting.lv2Status); return 0; -- cgit v1.2.3