[3/7] msvcrt: Rename _TRUNCATE to MSVCRT__TRUNCATE. (resend)
Alexander Scott-Johns
alexander.scott.johns at googlemail.com
Sun Jun 6 23:33:09 CDT 2010
This was patch 4/7, but didn't depend on patch 3/7.
-------------- next part --------------
From 70beffd165ff636fbc70f1532961ff8141648b80 Mon Sep 17 00:00:00 2001
From: Alexander Scott-Johns <alexander.scott.johns at googlemail.com>
Date: Sun, 6 Jun 2010 16:11:09 +0100
Subject: msvcrt: Rename _TRUNCATE to MSVCRT__TRUNCATE.
---
dlls/msvcrt/heap.c | 4 ++--
dlls/msvcrt/mbcs.c | 4 ++--
dlls/msvcrt/msvcrt.h | 2 +-
dlls/msvcrt/wcs.c | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c
index ad6bb37..b1d4076 100644
--- a/dlls/msvcrt/heap.c
+++ b/dlls/msvcrt/heap.c
@@ -578,7 +578,7 @@ int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements,
return MSVCRT_EINVAL;
}
- if(count!=_TRUNCATE && count<numberOfElements)
+ if(count!=MSVCRT__TRUNCATE && count<numberOfElements)
end = count;
else
end = numberOfElements-1;
@@ -586,7 +586,7 @@ int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements,
for(i=0; i<end && src[i]; i++)
dest[i] = src[i];
- if(!src[i] || end==count || count==_TRUNCATE) {
+ if(!src[i] || end==count || count==MSVCRT__TRUNCATE) {
dest[i] = '\0';
return 0;
}
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index 8fca06d..76d562c 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -1783,7 +1783,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr,
return MSVCRT_EINVAL;
}
- if(count==_TRUNCATE || size<count)
+ if(count==MSVCRT__TRUNCATE || size<count)
conv = size;
else
conv = count;
@@ -1791,7 +1791,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr,
conv = MSVCRT__mbstowcs_l(wcstr, mbstr, conv, locale);
if(conv<size)
wcstr[conv++] = '\0';
- else if(conv==size && (count==_TRUNCATE || wcstr[conv-1]=='\0'))
+ else if(conv==size && (count==MSVCRT__TRUNCATE || wcstr[conv-1]=='\0'))
wcstr[conv-1] = '\0';
else {
MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index 8dd8881..f68790b 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -709,7 +709,7 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int);
#define _MB_CP_ANSI -3
#define _MB_CP_LOCALE -4
-#define _TRUNCATE ((MSVCRT_size_t)-1)
+#define MSVCRT__TRUNCATE ((MSVCRT_size_t)-1)
void __cdecl MSVCRT_free(void*);
void* __cdecl MSVCRT_malloc(MSVCRT_size_t);
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index b9ac8f7..90bc3b8 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -304,7 +304,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr,
return MSVCRT_EINVAL;
}
- if(count==_TRUNCATE || size<count)
+ if(count==MSVCRT__TRUNCATE || size<count)
conv = size;
else
conv = count;
@@ -312,7 +312,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr,
conv = MSVCRT__wcstombs_l(mbstr, wcstr, conv, locale);
if(conv<size)
mbstr[conv++] = '\0';
- else if(conv==size && (count==_TRUNCATE || mbstr[conv-1]=='\0'))
+ else if(conv==size && (count==MSVCRT__TRUNCATE || mbstr[conv-1]=='\0'))
mbstr[conv-1] = '\0';
else {
MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
@@ -1043,7 +1043,7 @@ int CDECL MSVCRT_vsnprintf_s_l( char *str, MSVCRT_size_t sizeOfBuffer,
ret = vsnprintf_internal(str, len, format, locale, TRUE, valist);
if(ret<0 || ret==len) {
- if(count!=_TRUNCATE && count>sizeOfBuffer) {
+ if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) {
MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 );
*MSVCRT__errno() = MSVCRT_ERANGE;
memset(str, 0, sizeOfBuffer);
@@ -1154,7 +1154,7 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer
ret = vsnwprintf_internal(str, len, format, locale, TRUE, valist);
if(ret<0 || ret==len) {
- if(count!=_TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) {
+ if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) {
MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 );
*MSVCRT__errno() = MSVCRT_ERANGE;
memset(str, 0, sizeOfBuffer);
--
1.6.0.4
More information about the wine-patches
mailing list