SIZEOF replaced with more secure analog - _countof

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

1 files changed, 24 insertions, 24 deletions

diff --git a/plugins/WebView/src/webview_alerts.cpp b/plugins/WebView/src/webview_alerts.cpp
index feffb27c1f..5e1810cd89 100644
--- a/plugins/WebView/src/webview_alerts.cpp
+++ b/plugins/WebView/src/webview_alerts.cpp
@@ -116,7 +116,7 @@ int PopupAlert(WPARAM wParam, LPARAM lParam)
 	if( ((HANDLE)wParam) != NULL) {

 		DBVARIANT dbv;

 		db_get_ts(wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv);

-		mir_tstrncpy(ppd.lptzContactName, dbv.ptszVal, SIZEOF(ppd.lptzContactName));

+		mir_tstrncpy(ppd.lptzContactName, dbv.ptszVal, _countof(ppd.lptzContactName));

 		db_free(&dbv);

 	}

 	else mir_tstrcpy(ppd.lptzContactName, _T(MODULENAME));

@@ -126,9 +126,9 @@ int PopupAlert(WPARAM wParam, LPARAM lParam)
 

 	TCHAR *displaytext = (TCHAR*)lParam;

 	if ((mir_tstrlen(displaytext) == MAX_SECONDLINE) ||  (mir_tstrlen(displaytext) > MAX_SECONDLINE))

-		mir_sntprintf(ppd.lptzText, SIZEOF(ppd.lptzText), displaytext);

+		mir_sntprintf(ppd.lptzText, _countof(ppd.lptzText), displaytext);

 	else if (mir_tstrlen(displaytext) < MAX_SECONDLINE)

-		mir_sntprintf(ppd.lptzText, SIZEOF(ppd.lptzText), displaytext);

+		mir_sntprintf(ppd.lptzText, _countof(ppd.lptzText), displaytext);

 

 	if ( db_get_b(NULL, MODULENAME, POP_USECUSTCLRS_KEY, 0)) {

 		ppd.colorBack = db_get_dw(NULL, MODULENAME, POP_BG_CLR_KEY, Def_color_bg);

@@ -161,15 +161,15 @@ int OSDAlert(WPARAM hContact, LPARAM lParam)
 	if (hContact != NULL) {

 		DBVARIANT dbv;

 		if (!db_get_s(hContact, MODULENAME, PRESERVE_NAME_KEY, &dbv)) {

-			strncpy_s(contactname, SIZEOF(contactname), dbv.pszVal, _TRUNCATE);

+			strncpy_s(contactname, _countof(contactname), dbv.pszVal, _TRUNCATE);

 			db_free(&dbv);

 		}

 	}

 	if (contactname[0] == 0)

-		strncpy_s(contactname, SIZEOF(contactname), MODULENAME, _TRUNCATE);

+		strncpy_s(contactname, _countof(contactname), MODULENAME, _TRUNCATE);

 

 	char *displaytext = (char*)lParam;

-	mir_snprintf(newdisplaytext, SIZEOF(newdisplaytext), "%s: %s", contactname, Translate(displaytext));

+	mir_snprintf(newdisplaytext, _countof(newdisplaytext), "%s: %s", contactname, Translate(displaytext));

 

 	if (ServiceExists("OSD/Announce"))

 		CallService("OSD/Announce", (WPARAM)newdisplaytext, 0);

@@ -188,11 +188,11 @@ int ErrorMsgs(WPARAM wParam, LPARAM lParam)
 

 	TCHAR *ptszContactName = pcli->pfnGetContactDisplayName(hContact, 0);

 	if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, MODULENAME, ERROR_POPUP_KEY, 0)) {

-		mir_sntprintf(newdisplaytext, SIZEOF(newdisplaytext), _T("%s\n%s"), ptszContactName, displaytext);

+		mir_sntprintf(newdisplaytext, _countof(newdisplaytext), _T("%s\n%s"), ptszContactName, displaytext);

 		PUShowMessageT(newdisplaytext, SM_WARNING);

 	}

 	else if ( ServiceExists("OSD/Announce") && db_get_b(NULL, MODULENAME, ERROR_POPUP_KEY, 0)) {

-		mir_sntprintf(newdisplaytext, SIZEOF(newdisplaytext), _T("%s: %s"), ptszContactName, TranslateTS(displaytext));

+		mir_sntprintf(newdisplaytext, _countof(newdisplaytext), _T("%s: %s"), ptszContactName, TranslateTS(displaytext));

 		CallService("OSD/Announce", (WPARAM)newdisplaytext, 0);

 	}

 	else if (ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) {

@@ -220,7 +220,7 @@ void SaveToFile(MCONTACT hContact, char *truncated)
 	char url[300]; url[0] = '\0';

 	DBVARIANT dbv;

 	if (!db_get_s(hContact, MODULENAME, URL_KEY, &dbv)) {

-		strncpy_s(url, SIZEOF(url), dbv.pszVal, _TRUNCATE);

+		strncpy_s(url, _countof(url), dbv.pszVal, _TRUNCATE);

 		db_free(&dbv);

 	}

 

@@ -237,10 +237,10 @@ void SaveToFile(MCONTACT hContact, char *truncated)
 		time_t ftime = time(NULL);

 		struct tm *nTime = localtime(&ftime);

 

-		mir_snprintf(timeprefix, SIZEOF(timeprefix), " %s ", Translate("Last updated on"));

+		mir_snprintf(timeprefix, _countof(timeprefix), " %s ", Translate("Last updated on"));

 		strftime(temptime1, 32, " %a, %b %d, %Y ", nTime);

 		strftime(temptime2, 32, " %I:%M %p.", nTime);

-		mir_snprintf(timestring, SIZEOF(timestring), "(%s)%s\n%s,%s\n", MODULENAME, url, temptime1, temptime2);

+		mir_snprintf(timestring, _countof(timestring), "(%s)%s\n%s,%s\n", MODULENAME, url, temptime1, temptime2);

 

 		fputs(timestring, pfile);

 		fwrite(truncated, mir_strlen(truncated), 1, pfile);

@@ -272,7 +272,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn
 	memset(&tempraw, 0, sizeof(tempraw));

 	memset(&raw, 0, sizeof(raw));

 

-	strncpy(tempraw, truncated, SIZEOF(tempraw));

+	strncpy(tempraw, truncated, _countof(tempraw));

 

 	memset(&alertstring, 0, sizeof(alertstring));

 	memset(&Alerttempstring, 0, sizeof(Alerttempstring));

@@ -345,7 +345,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn
 

 		if (eventIndex == 0) { // string present

 			if (!db_get_s(hContact, MODULENAME, ALERT_STRING_KEY, &tdbv)) {

-				strncpy_s(alertstring, SIZEOF(alertstring), tdbv.pszVal, _TRUNCATE);

+				strncpy_s(alertstring, _countof(alertstring), tdbv.pszVal, _TRUNCATE);

 				db_free(&tdbv);

 

 				if ((strstr(tempraw, alertstring)) != 0) { // // ENDALERT EVENT:CHECK FOR STRING

@@ -357,7 +357,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn
 					//

 					if ((!notpresent)) {

 						if (alertIndex == 0) { // popup

-							mir_sntprintf(displaystring, SIZEOF(displaystring), _T("%s \"%S\" %s."), Translate("The string"), alertstring, Translate("has been found on the web page"));

+							mir_sntprintf(displaystring, _countof(displaystring), _T("%s \"%S\" %s."), Translate("The string"), alertstring, Translate("has been found on the web page"));

 							WAlertPopup(hContact, displaystring);

 

 							// contactlist name//

@@ -397,7 +397,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn
 							}

 						}

 						else if (alertIndex == 3) {

-							mir_sntprintf(displaystring, SIZEOF(displaystring), _T("%s \"%s\" %s."), TranslateT("The string"), alertstring, TranslateT("has been found on the web page"));

+							mir_sntprintf(displaystring, _countof(displaystring), _T("%s \"%s\" %s."), TranslateT("The string"), alertstring, TranslateT("has been found on the web page"));

 							WAlertOSD(hContact, displaystring);

 

 							// contactlist name//

@@ -421,14 +421,14 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn
 		else if (eventIndex == 1) { // webpage changed

 			// TEST GET NAME FOR CACHE

 			TCHAR cachepath[MAX_PATH], cachedirectorypath[MAX_PATH], newcachepath[MAX_PATH + 50];

-			GetModuleFileName(hInst, cachepath, SIZEOF(cachepath));

+			GetModuleFileName(hInst, cachepath, _countof(cachepath));

 			TCHAR *cacheend = _tcsrchr(cachepath, '\\');

 			cacheend++;

 			*cacheend = '\0';

 

-			mir_sntprintf(cachedirectorypath, SIZEOF(cachedirectorypath), _T("%s%S%S"), cachepath, MODULENAME, "cache\\");

+			mir_sntprintf(cachedirectorypath, _countof(cachedirectorypath), _T("%s%S%S"), cachepath, MODULENAME, "cache\\");

 			CreateDirectory(cachedirectorypath, NULL);

-			mir_sntprintf(newcachepath, SIZEOF(newcachepath), _T("%s%S%S%S%S"), cachepath, MODULENAME, "cache\\", contactname, ".txt");

+			mir_sntprintf(newcachepath, _countof(newcachepath), _T("%s%S%S%S%S"), cachepath, MODULENAME, "cache\\", contactname, ".txt");

 			// file exists?

 			if ( _taccess(newcachepath, 0) != -1) {

 				if ((pcachefile = _tfopen(newcachepath, _T("r"))) == NULL)

@@ -516,11 +516,11 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn
 		if (eventIndex == 2) { // part of webpage changed

 			Alerttempstring[0] = Alerttempstring2[0] = 0;

 			if (!db_get_s(hContact, MODULENAME, ALRT_S_STRING_KEY, &tdbv)) {

-				strncpy_s(Alerttempstring, SIZEOF(Alerttempstring), tdbv.pszVal, _TRUNCATE);

+				strncpy_s(Alerttempstring, _countof(Alerttempstring), tdbv.pszVal, _TRUNCATE);

 				db_free(&tdbv);

 			}

 			if (!db_get_s(hContact, MODULENAME, ALRT_E_STRING_KEY, &tdbv)) {

-				strncpy_s(Alerttempstring2, SIZEOF(Alerttempstring2), tdbv.pszVal, _TRUNCATE);

+				strncpy_s(Alerttempstring2, _countof(Alerttempstring2), tdbv.pszVal, _TRUNCATE);

 				db_free(&tdbv);

 			}

 

@@ -633,14 +633,14 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn
 			if (((strstr(tempraw, Alerttempstring)) != 0) && ((strstr(tempraw, Alerttempstring2)) != 0)) {

 				// TEST GET NAME FOR CACHE

 				TCHAR cachepath[MAX_PATH], cachedirectorypath[MAX_PATH], newcachepath[MAX_PATH + 50];

-				GetModuleFileName(hInst, cachepath, SIZEOF(cachepath));

+				GetModuleFileName(hInst, cachepath, _countof(cachepath));

 				TCHAR *cacheend = _tcsrchr(cachepath, '\\');

 				cacheend++;

 				*cacheend = '\0';

 

-				mir_sntprintf(cachedirectorypath, SIZEOF(cachedirectorypath), _T("%s%S%S"), cachepath, MODULENAME, "cache\\");

+				mir_sntprintf(cachedirectorypath, _countof(cachedirectorypath), _T("%s%S%S"), cachepath, MODULENAME, "cache\\");

 				CreateDirectory(cachedirectorypath, NULL);

-				mir_sntprintf(newcachepath, SIZEOF(newcachepath), _T("%s%S%S%S%S"), cachepath, MODULENAME, "cache\\", contactname, ".txt");

+				mir_sntprintf(newcachepath, _countof(newcachepath), _T("%s%S%S%S%S"), cachepath, MODULENAME, "cache\\", contactname, ".txt");

 				// file exists?

 				if ( _taccess(newcachepath, 0) != -1) {

 					if ((pcachefile = _tfopen(newcachepath, _T("r"))) == NULL)

@@ -802,7 +802,7 @@ void ReadFromFile(void *param)
 

 	char contactname[100]; contactname[0] = 0;

 	if (!db_get_s(hContact, "CList", "MyHandle", &dbv)) {

-		strncpy_s(contactname, SIZEOF(contactname), dbv.pszVal, _TRUNCATE);

+		strncpy_s(contactname, _countof(contactname), dbv.pszVal, _TRUNCATE);

 		db_free(&dbv);

 	}