From 4c814798c7bc7f6a0f92c21b027b26290622aa2f Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 19 Jun 2015 19:35:42 +0000
Subject: SIZEOF replaced with more secure analog - _countof

git-svn-id: http://svn.miranda-ng.org/main/trunk@14270 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/YAMN/src/mails/decode.cpp |  2 +-
 plugins/YAMN/src/mails/mime.cpp   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins/YAMN/src/mails')

diff --git a/plugins/YAMN/src/mails/decode.cpp b/plugins/YAMN/src/mails/decode.cpp
index 320cda63ff..96c561808d 100644
--- a/plugins/YAMN/src/mails/decode.cpp
+++ b/plugins/YAMN/src/mails/decode.cpp
@@ -151,7 +151,7 @@ struct _tcptable CodePageNamesAll[]=
 	{ "MAC-", "CR",0,10082}
 };
 
-int CPLENALL = SIZEOF(CodePageNamesAll);
+int CPLENALL = _countof(CodePageNamesAll);
 struct _tcptable *CodePageNamesSupp;
 int CPLENSUPP = 1;
 
diff --git a/plugins/YAMN/src/mails/mime.cpp b/plugins/YAMN/src/mails/mime.cpp
index aa0d0b0782..4dc0c5aefc 100644
--- a/plugins/YAMN/src/mails/mime.cpp
+++ b/plugins/YAMN/src/mails/mime.cpp
@@ -661,36 +661,36 @@ FailBackRaw:
 	for (i=0;i<numparts;i++) {
 		if (i) { // part before first boudary should not have headers
 			char infoline[1024]; size_t linesize = 0;
-			mir_snprintf(infoline, SIZEOF(infoline), "%s %d", Translate("Part"), i);
+			mir_snprintf(infoline, _countof(infoline), "%s %d", Translate("Part"), i);
 			linesize = mir_strlen(infoline);
 			if (partData[i].TransEnc) {
-				mir_snprintf(infoline + linesize, SIZEOF(infoline) - linesize, "; %s", partData[i].TransEnc);
+				mir_snprintf(infoline + linesize, _countof(infoline) - linesize, "; %s", partData[i].TransEnc);
 				linesize = mir_strlen(infoline);
 			}
 			if (partData[i].ContType) {
 				char *CharSetStr=strchr(partData[i].ContType,';');
 				if (CharSetStr) {
 					CharSetStr[0]=0;
-					mir_snprintf(infoline + linesize, SIZEOF(infoline) - linesize, "; %s", partData[i].ContType);
+					mir_snprintf(infoline + linesize, _countof(infoline) - linesize, "; %s", partData[i].ContType);
 					linesize = mir_strlen(infoline);
 					partData[i].ContType=CharSetStr+1;
 					if (NULL != (CharSetStr=ExtractFromContentType(partData[i].ContType,"charset="))) {
-						mir_snprintf(infoline + linesize, SIZEOF(infoline) - linesize, "; %s", CharSetStr);
+						mir_snprintf(infoline + linesize, _countof(infoline) - linesize, "; %s", CharSetStr);
 						linesize = mir_strlen(infoline);
 						delete[] CharSetStr;
 					}
 					if (NULL != (CharSetStr=ExtractFromContentType(partData[i].ContType,"name="))) {
-						mir_snprintf(infoline + linesize, SIZEOF(infoline) - linesize, "; \"%s\"", CharSetStr);
+						mir_snprintf(infoline + linesize, _countof(infoline) - linesize, "; \"%s\"", CharSetStr);
 						linesize = mir_strlen(infoline);
 						delete[] CharSetStr;
 					}
 				}
 				else {
-					mir_snprintf(infoline + linesize, SIZEOF(infoline) - linesize, "; %s", partData[i].ContType);
+					mir_snprintf(infoline + linesize, _countof(infoline) - linesize, "; %s", partData[i].ContType);
 					linesize = mir_strlen(infoline);
 				}
 			}
-			mir_snprintf(infoline + linesize, SIZEOF(infoline) - linesize, ".\r\n");
+			mir_snprintf(infoline + linesize, _countof(infoline) - linesize, ".\r\n");
 			{
 				WCHAR *temp=0;
 				dest[destpos] = dest[destpos+1] = dest[destpos+2] = 0x2022; // bullet;
-- 
cgit v1.2.3