diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-19 19:35:42 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-19 19:35:42 +0000 |
| commit | 4c814798c7bc7f6a0f92c21b027b26290622aa2f (patch) | |
| tree | 9bbfb38bd639f352300aa16ff7c45f5a9b2dba6d /include | |
| parent | f0f0cd088f1ec3a85abee825ddbc214f3f6b92c3 (diff) | |
SIZEOF replaced with more secure analog - _countof
git-svn-id: http://svn.miranda-ng.org/main/trunk@14270 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include')
| -rw-r--r-- | include/delphi/m_netlib.inc | 2 | ||||
| -rw-r--r-- | include/m_core.h | 1 | ||||
| -rw-r--r-- | include/m_netlib.h | 4 | ||||
| -rw-r--r-- | include/m_system.h | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/include/delphi/m_netlib.inc b/include/delphi/m_netlib.inc index fe46250469..e2d87ee369 100644 --- a/include/delphi/m_netlib.inc +++ b/include/delphi/m_netlib.inc @@ -154,7 +154,7 @@ const {$IFNDEF WIN64}
NETLIBOPENCONNECTION_V1_SIZE = 16;
{$ELSE}
- NETLIBOPENCONNECTION_V1_SIZE = SIZEOF(TNETLIBOPENCONNECTION);
+ NETLIBOPENCONNECTION_V1_SIZE = sizeof(TNETLIBOPENCONNECTION);
{$ENDIF}
// old sizeof() is 14 bytes, but there is padding of 2 bytes
diff --git a/include/m_core.h b/include/m_core.h index 8ee979e305..2596a01d42 100644 --- a/include/m_core.h +++ b/include/m_core.h @@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define M_CORE_H__ 1
#include <stdint.h>
+#include <stdlib.h>
#ifndef M_TYPES_H__
#include <m_types.h>
diff --git a/include/m_netlib.h b/include/m_netlib.h index 6248ec1219..0035c1acf1 100644 --- a/include/m_netlib.h +++ b/include/m_netlib.h @@ -793,7 +793,7 @@ __inline INT_PTR Netlib_Logf(HANDLE hUser, const char *fmt, ...) va_list va;
va_start(va, fmt);
char szText[1024];
- mir_vsnprintf(szText, sizeof(szText), fmt, va);
+ mir_vsnprintf(szText, _countof(szText), fmt, va);
va_end(va);
return CallService(MS_NETLIB_LOG, (WPARAM)hUser, (LPARAM)szText);
}
@@ -803,7 +803,7 @@ __inline INT_PTR Netlib_LogfW(HANDLE hUser, const wchar_t *fmt, ...) va_list va;
va_start(va, fmt);
wchar_t szText[1024];
- mir_vsnwprintf(szText, SIZEOF(szText), fmt, va);
+ mir_vsnwprintf(szText, _countof(szText), fmt, va);
va_end(va);
return CallService(MS_NETLIB_LOGW, (WPARAM)hUser, (LPARAM)szText);
}
diff --git a/include/m_system.h b/include/m_system.h index 7f7130f693..d29911c99f 100644 --- a/include/m_system.h +++ b/include/m_system.h @@ -45,8 +45,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #pragma warning(disable:4244 4245)
#endif
-#define SIZEOF(X) (sizeof(X)/sizeof(X[0]))
-
#define NEWSTR_ALLOCA(A) (A == NULL)?NULL:strcpy((char*)alloca(strlen(A)+1), A)
#define NEWWSTR_ALLOCA(A) ((A==NULL)?NULL:wcscpy((wchar_t*)alloca(sizeof(wchar_t)*(wcslen(A)+1)),A))
#define NEWTSTR_ALLOCA(A) (A == NULL)?NULL:_tcscpy((TCHAR*)alloca((_tcslen(A)+1)* sizeof(TCHAR)), A)
|