new mir_snprintf templates without SIZEOF

git-svn-id: http://svn.miranda-ng.org/main/trunk@14002 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 33 insertions, 33 deletions

diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp
index 99ca669461..0c19914ee0 100644
--- a/plugins/SimpleStatusMsg/src/options.cpp
+++ b/plugins/SimpleStatusMsg/src/options.cpp
@@ -146,10 +146,10 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 							if (!IsAccountEnabled(accounts->pa[j]) || !CallProtoService(accounts->pa[j]->szModuleName, PS_GETCAPS, PFLAGNUM_3, 0) || !(CallProtoService(accounts->pa[j]->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND))

 								continue;

 

-							mir_snprintf(setting, SIZEOF(setting), "%sFlags", accounts->pa[j]->szModuleName);

+							mir_snprintf(setting, "%sFlags", accounts->pa[j]->szModuleName);

 							val = db_get_b(NULL, "SimpleStatusMsg", (char *)StatusModeToDbSetting(i, setting), STATUS_DEFAULT);

 							data->status_msg[j+1].flags[i-ID_STATUS_ONLINE] = val;

-							mir_snprintf(setting, SIZEOF(setting), "%sDefault", accounts->pa[j]->szModuleName);

+							mir_snprintf(setting, "%sDefault", accounts->pa[j]->szModuleName);

 							text = db_get_tsa(NULL, "SRAway", StatusModeToDbSetting(i, setting));

 							mir_tstrncpy(data->status_msg[j + 1].msg[i - ID_STATUS_ONLINE], (text == NULL) ? GetDefaultMessage(i) : text, 1024);

 						}

@@ -202,14 +202,14 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 					// SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_SETITEMDATA, index, (LPARAM)i + 1);

 					if (index != CB_ERR && index != CB_ERRSPACE)

 					{

-						mir_snprintf(setting, SIZEOF(setting), "Proto%sDefault", accounts->pa[i]->szModuleName);

+						mir_snprintf(setting, "Proto%sDefault", accounts->pa[i]->szModuleName);

 						data->proto_msg[i+1].msg = db_get_tsa(NULL, "SimpleStatusMsg", setting);

 

-						mir_snprintf(setting, SIZEOF(setting), "Proto%sFlags", accounts->pa[i]->szModuleName);

+						mir_snprintf(setting, "Proto%sFlags", accounts->pa[i]->szModuleName);

 						val = db_get_b(NULL, "SimpleStatusMsg", setting, PROTO_DEFAULT);

 						data->proto_msg[i+1].flags = val;

 

-						mir_snprintf(setting, SIZEOF(setting), "Proto%sMaxLen", accounts->pa[i]->szModuleName);

+						mir_snprintf(setting, "Proto%sMaxLen", accounts->pa[i]->szModuleName);

 						val = db_get_w(NULL, "SimpleStatusMsg", setting, 1024);

 						data->proto_msg[i+1].max_length = val;

 						SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_SETITEMDATA, (WPARAM)index, (LPARAM)i + 1);

@@ -442,9 +442,9 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 							DBVARIANT dbv, dbv2;

 

 							if (i)

-								mir_snprintf(setting, SIZEOF(setting), "Last%sMsg", accounts->pa[k]->szModuleName);

+								mir_snprintf(setting, "Last%sMsg", accounts->pa[k]->szModuleName);

 							else

-								mir_snprintf(setting, SIZEOF(setting), "LastMsg");

+								mir_snprintf(setting, "LastMsg");

 

 							SetDlgItemText(hwndDlg, IDC_OPTEDIT1, _T(""));

 							if (!db_get(NULL, "SimpleStatusMsg", setting, &dbv))

@@ -486,9 +486,9 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 							DBVARIANT dbv;

 

 							if (i)

-								mir_snprintf(setting, SIZEOF(setting), "%sMsg", accounts->pa[k]->szModuleName);

+								mir_snprintf(setting, "%sMsg", accounts->pa[k]->szModuleName);

 							else

-								mir_snprintf(setting, SIZEOF(setting), "Msg");

+								mir_snprintf(setting, "Msg");

 

 							if (!db_get_ts(NULL, "SRAway", StatusModeToDbSetting(j + ID_STATUS_ONLINE, setting), &dbv))

 							{

@@ -597,9 +597,9 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 							DBVARIANT dbv, dbv2;

 

 							if (i)

-								mir_snprintf(setting, SIZEOF(setting), "Last%sMsg", accounts->pa[i-1]->szModuleName);

+								mir_snprintf(setting, "Last%sMsg", accounts->pa[i-1]->szModuleName);

 							else

-								mir_snprintf(setting, SIZEOF(setting), "LastMsg");

+								mir_snprintf(setting, "LastMsg");

 

 							SetDlgItemText(hwndDlg, IDC_OPTEDIT1, _T(""));

 							if (!db_get(NULL, "SimpleStatusMsg", setting, &dbv))

@@ -640,9 +640,9 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 							DBVARIANT dbv;

 

 							if (i)

-								mir_snprintf(setting, SIZEOF(setting), "%sMsg", accounts->pa[i-1]->szModuleName);

+								mir_snprintf(setting, "%sMsg", accounts->pa[i-1]->szModuleName);

 							else

-								mir_snprintf(setting, SIZEOF(setting), "Msg");

+								mir_snprintf(setting, "Msg");

 

 							if (!db_get_ts(NULL, "SRAway", StatusModeToDbSetting(j + ID_STATUS_ONLINE, setting), &dbv))

 							{

@@ -697,9 +697,9 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 						DBVARIANT dbv,dbv2;

 

 						if (j)

-							mir_snprintf(setting, SIZEOF(setting), "Last%sMsg", accounts->pa[j-1]->szModuleName);

+							mir_snprintf(setting, "Last%sMsg", accounts->pa[j-1]->szModuleName);

 						else

-							mir_snprintf(setting, SIZEOF(setting), "LastMsg");

+							mir_snprintf(setting, "LastMsg");

 

 						SetDlgItemText(hwndDlg, IDC_OPTEDIT1, _T(""));

 						if (!db_get(NULL, "SimpleStatusMsg", setting, &dbv))

@@ -732,9 +732,9 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 						DBVARIANT dbv;

 

 						if (j)

-							mir_snprintf(setting, SIZEOF(setting), "%sMsg", accounts->pa[j-1]->szModuleName);

+							mir_snprintf(setting, "%sMsg", accounts->pa[j-1]->szModuleName);

 						else

-							mir_snprintf(setting, SIZEOF(setting), "Msg");

+							mir_snprintf(setting, "Msg");

 

 						if (!db_get_ts(NULL, "SRAway", StatusModeToDbSetting(i + ID_STATUS_ONLINE, setting), &dbv))

 						{

@@ -811,9 +811,9 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 						DBVARIANT dbv, dbv2;

 

 						if (j)

-							mir_snprintf(setting, SIZEOF(setting), "Last%sMsg", accounts->pa[j-1]->szModuleName);

+							mir_snprintf(setting, "Last%sMsg", accounts->pa[j-1]->szModuleName);

 						else

-							mir_snprintf(setting, SIZEOF(setting), "LastMsg");

+							mir_snprintf(setting, "LastMsg");

 

 						SetDlgItemText(hwndDlg, IDC_OPTEDIT1, _T(""));

 						if (!db_get(NULL, "SimpleStatusMsg", setting, &dbv))

@@ -846,9 +846,9 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 						DBVARIANT dbv;

 

 						if (j)

-							mir_snprintf(setting, SIZEOF(setting), "%sMsg", accounts->pa[j-1]->szModuleName);

+							mir_snprintf(setting, "%sMsg", accounts->pa[j-1]->szModuleName);

 						else

-							mir_snprintf(setting, SIZEOF(setting), "Msg");

+							mir_snprintf(setting, "Msg");

 

 						if (!db_get_ts(NULL, "SRAway", StatusModeToDbSetting(i+ID_STATUS_ONLINE, setting), &dbv))

 						{

@@ -1028,10 +1028,10 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 

 						if (CallProtoService(accounts->pa[j]->szModuleName, PS_GETCAPS, PFLAGNUM_3, 0) & Proto_Status2Flag(i))

 						{

-							mir_snprintf(szSetting, SIZEOF(szSetting), "%sDefault", accounts->pa[j]->szModuleName);

+							mir_snprintf(szSetting, "%sDefault", accounts->pa[j]->szModuleName);

 							db_set_ts(NULL, "SRAway", StatusModeToDbSetting(i, szSetting), data->status_msg[j + 1].msg[i - ID_STATUS_ONLINE]);

 

-							mir_snprintf(szSetting, SIZEOF(szSetting), "%sFlags", accounts->pa[j]->szModuleName);

+							mir_snprintf(szSetting, "%sFlags", accounts->pa[j]->szModuleName);

 							db_set_b(NULL, "SimpleStatusMsg", StatusModeToDbSetting(i, szSetting), (BYTE)data->status_msg[j + 1].flags[i - ID_STATUS_ONLINE]);

 						}

 					}

@@ -1055,16 +1055,16 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 					if (!(CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND))

 						continue;

 

-					mir_snprintf(szSetting, SIZEOF(szSetting), "Proto%sDefault", accounts->pa[i]->szModuleName);

+					mir_snprintf(szSetting, "Proto%sDefault", accounts->pa[i]->szModuleName);

 					if (data->proto_msg[i+1].msg && (data->proto_msg[i+1].flags & PROTO_THIS_MSG))

 						db_set_ts(NULL, "SimpleStatusMsg", szSetting, data->proto_msg[i+1].msg);

 					//						else

 					//							db_unset(NULL, "SimpleStatusMsg", szSetting);

 

-					mir_snprintf(szSetting, SIZEOF(szSetting), "Proto%sMaxLen", accounts->pa[i]->szModuleName);

+					mir_snprintf(szSetting, "Proto%sMaxLen", accounts->pa[i]->szModuleName);

 					db_set_w(NULL, "SimpleStatusMsg", szSetting, (WORD)data->proto_msg[i+1].max_length);

 

-					mir_snprintf(szSetting, SIZEOF(szSetting), "Proto%sFlags", accounts->pa[i]->szModuleName);

+					mir_snprintf(szSetting, "Proto%sFlags", accounts->pa[i]->szModuleName);

 					db_set_b(NULL, "SimpleStatusMsg", szSetting, (BYTE)data->proto_msg[i+1].flags);

 				}

 			}

@@ -1197,7 +1197,7 @@ static BOOL IsHistoryMsgsFound(HWND hwndDlg, int histMax)
 	for (int i = 1; i <= histMax; ++i, --j) {

 		if (j < 1)

 			j = histMax;

-		mir_snprintf(szSetting, SIZEOF(szSetting), "SMsg%d", j);

+		mir_snprintf(szSetting, "SMsg%d", j);

 		if (!db_get_ts(NULL, "SimpleStatusMsg", szSetting, &dbv)) {

 			if (dbv.ptszVal != NULL && *dbv.ptszVal != '\0') {

 				db_free(&dbv);

@@ -1360,7 +1360,7 @@ static INT_PTR CALLBACK DlgAdvancedOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM w
 					if (!(CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND))

 						continue;

 

-					mir_snprintf(setting, SIZEOF(setting), "Last%sMsg", accounts->pa[i]->szModuleName);

+					mir_snprintf(setting, "Last%sMsg", accounts->pa[i]->szModuleName);

 					db_set_s(NULL, "SimpleStatusMsg", setting, "");

 				}

 				db_set_w(NULL, "SimpleStatusMsg", "LMMsg", (WORD)max_hist_msgs);

@@ -1379,7 +1379,7 @@ static INT_PTR CALLBACK DlgAdvancedOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM w
 

 				nDefMSgCount = db_get_w(NULL, "SimpleStatusMsg", "DefMsgCount", 0);

 				for (int i = 1; i <= nDefMSgCount; i++) {

-					mir_snprintf(szSetting, SIZEOF(szSetting), "DefMsg%d", i);

+					mir_snprintf(szSetting, "DefMsg%d", i);

 					db_unset(NULL, "SimpleStatusMsg", szSetting);

 				}

 				db_set_w(NULL, "SimpleStatusMsg", "DefMsgCount", 0);

@@ -1458,9 +1458,9 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
 				if (index != LB_ERR && index != LB_ERRSPACE)

 				{

 					char setting[80];

-					mir_snprintf(setting, SIZEOF(setting), "Startup%sStatus", accounts->pa[i]->szModuleName);

+					mir_snprintf(setting, "Startup%sStatus", accounts->pa[i]->szModuleName);

 					data->status[i] = db_get_w(NULL, "SimpleStatusMsg", setting, ID_STATUS_CURRENT);

-					mir_snprintf(setting, SIZEOF(setting), "Set%sStatusDelay", accounts->pa[i]->szModuleName);

+					mir_snprintf(setting, "Set%sStatusDelay", accounts->pa[i]->szModuleName);

 					data->setdelay[i] = db_get_w(NULL, "SimpleStatusMsg", setting, 300);

 					SendDlgItemMessage(hwndDlg, IDC_LISTPROTO, LB_SETITEMDATA, (WPARAM)index, (LPARAM)i);

 				}

@@ -1640,10 +1640,10 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
 				if (!IsAccountEnabled(accounts->pa[i]) || !(CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0)&~CallProtoService(accounts->pa[i]->szModuleName, PS_GETCAPS, PFLAGNUM_5, 0)))

 					continue;

 

-				mir_snprintf(szSetting, SIZEOF(szSetting), "Startup%sStatus", accounts->pa[i]->szModuleName);

+				mir_snprintf(szSetting, "Startup%sStatus", accounts->pa[i]->szModuleName);

 				db_set_w(NULL, "SimpleStatusMsg", szSetting, (WORD)data->status[i]);

 

-				mir_snprintf(szSetting, SIZEOF(szSetting), "Set%sStatusDelay", accounts->pa[i]->szModuleName);

+				mir_snprintf(szSetting, "Set%sStatusDelay", accounts->pa[i]->szModuleName);

 				db_set_w(NULL, "SimpleStatusMsg", szSetting, (WORD)data->setdelay[i]);

 			}

 			db_set_w(NULL, "SimpleStatusMsg", "SetStatusDelay", (WORD)data->setglobaldelay);