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/SMS/src/SMS_svc.cpp | 2 +- plugins/SMS/src/functions.cpp | 14 +++++++------- plugins/SMS/src/senddlg.cpp | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/SMS/src') diff --git a/plugins/SMS/src/SMS_svc.cpp b/plugins/SMS/src/SMS_svc.cpp index 28d787b4c3..12090b2ed2 100644 --- a/plugins/SMS/src/SMS_svc.cpp +++ b/plugins/SMS/src/SMS_svc.cpp @@ -26,7 +26,7 @@ int LoadModules(void) HookEvent(ME_PROTO_ACCLISTCHANGED,RefreshAccountList); char szServiceFunction[MAX_PATH]; - mir_snprintf(szServiceFunction,sizeof(szServiceFunction),"%s%s",PROTOCOL_NAMEA,SMS_SEND); + mir_snprintf(szServiceFunction,SIZEOF(szServiceFunction),"%s%s",PROTOCOL_NAMEA,SMS_SEND); CLISTMENUITEM mi = { sizeof(mi) }; mi.position = 300050000; diff --git a/plugins/SMS/src/functions.cpp b/plugins/SMS/src/functions.cpp index 4d40969b44..b26d5fd4c9 100644 --- a/plugins/SMS/src/functions.cpp +++ b/plugins/SMS/src/functions.cpp @@ -104,7 +104,7 @@ DWORD GetContactPhonesCountParam(MCONTACT hContact,LPSTR lpszModule,LPSTR lpszVa dwRet++; for (i=0; i <= PHONES_MIN_COUNT; i++) { - mir_snprintf(szBuff,sizeof(szBuff),"%s%ld",lpszValueName,i); + mir_snprintf(szBuff,SIZEOF(szBuff),"%s%ld",lpszValueName,i); if ( DB_GetStaticStringW(hContact,lpszModule,szBuff,wszPhone,SIZEOF(wszPhone),&dwPhoneSize)) if ( IsPhoneW(wszPhone,dwPhoneSize)) dwRet++; @@ -144,7 +144,7 @@ BOOL IsContactPhoneParam(MCONTACT hContact,LPSTR lpszModule,LPSTR lpszValueName, } for (i=0; i <= PHONES_MIN_COUNT; i++) { - mir_snprintf(szBuff,sizeof(szBuff),"%s%ld",lpszValueName,i); + mir_snprintf(szBuff,SIZEOF(szBuff),"%s%ld",lpszValueName,i); if ( DB_GetStaticStringW(hContact,lpszModule,szBuff,wszPhoneLocal,SIZEOF(wszPhoneLocal),&dwPhoneSizeLocal)) { if (IsPhoneW(wszPhoneLocal,dwPhoneSizeLocal)) { dwPhoneSizeLocal=CopyNumberW(wszPhoneLocal,wszPhoneLocal,dwPhoneSizeLocal); @@ -447,7 +447,7 @@ void LoadMsgDlgFont(int i,LOGFONT *lf,COLORREF *colour) if (colour) { - mir_snprintf(str,sizeof(str),"Font%dCol",i); + mir_snprintf(str,SIZEOF(str),"Font%dCol",i); (*colour)=db_get_dw(NULL,SRMMMOD,str,fontOptionsList[0].defColour); } @@ -461,24 +461,24 @@ void LoadMsgDlgFont(int i,LOGFONT *lf,COLORREF *colour) db_free(&dbv); } - mir_snprintf(str,sizeof(str),"Font%dSize",i); + mir_snprintf(str,SIZEOF(str),"Font%dSize",i); lf->lfHeight=(char)db_get_b(NULL,SRMMMOD,str,fontOptionsList[0].defSize); lf->lfWidth=0; lf->lfEscapement=0; lf->lfOrientation=0; - mir_snprintf(str,sizeof(str),"Font%dSty",i); + mir_snprintf(str,SIZEOF(str),"Font%dSty",i); style=db_get_b(NULL,SRMMMOD,str,fontOptionsList[0].defStyle); lf->lfWeight=style&FONTF_BOLD?FW_BOLD:FW_NORMAL; lf->lfItalic=style&FONTF_ITALIC?1:0; lf->lfUnderline=0; lf->lfStrikeOut=0; - mir_snprintf(str,sizeof(str),"Font%dSet",i); + mir_snprintf(str,SIZEOF(str),"Font%dSet",i); lf->lfCharSet=db_get_b(NULL,SRMMMOD,str,MsgDlgGetFontDefaultCharset(lf->lfFaceName)); lf->lfOutPrecision=OUT_DEFAULT_PRECIS; lf->lfClipPrecision=CLIP_DEFAULT_PRECIS; lf->lfQuality=DEFAULT_QUALITY; lf->lfPitchAndFamily=DEFAULT_PITCH|FF_DONTCARE; - mir_snprintf(str,sizeof(str),"Font%d",i); + mir_snprintf(str,SIZEOF(str),"Font%d",i); } } diff --git a/plugins/SMS/src/senddlg.cpp b/plugins/SMS/src/senddlg.cpp index 7af503ed9a..d8bbc9b8ce 100644 --- a/plugins/SMS/src/senddlg.cpp +++ b/plugins/SMS/src/senddlg.cpp @@ -996,7 +996,7 @@ void AddContactPhonesToComboToListParam(MCONTACT hContact,LPSTR lpszModule,LPSTR for (i=0;TRUE;i++) { - mir_snprintf(szBuff,sizeof(szBuff),"%s%ld",lpszValueName,i); + mir_snprintf(szBuff,SIZEOF(szBuff),"%s%ld",lpszValueName,i); if (DB_GetStaticStringW(hContact,lpszModule,szBuff,tszPhoneRaw,SIZEOF(tszPhoneRaw),&dwPhoneSize)) { tszPhone[0]='+'; @@ -1063,7 +1063,7 @@ void AddContactPhonesToTreeViewParam(MCONTACT hContact,LPSTR lpszModule,LPSTR lp for (i=0;TRUE;i++) { - mir_snprintf(szBuff,sizeof(szBuff),"%s%ld",lpszValueName,i); + mir_snprintf(szBuff,SIZEOF(szBuff),"%s%ld",lpszValueName,i); if (DB_GetStaticStringW(hContact,lpszModule,szBuff,tszPhoneRaw,SIZEOF(tszPhoneRaw),&dwPhoneSize)) { tszPhone[0]='+'; -- cgit v1.2.3