Jactry Zeng : msvcrt: Fixed typo of _strncoll and _strncoll_l.
Alexandre Julliard
julliard at winehq.org
Mon Apr 29 13:55:24 CDT 2013
Module: wine
Branch: master
Commit: 7cd91b6452e300104e087601801fb1acee9f91c8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd91b6452e300104e087601801fb1acee9f91c8
Author: Jactry Zeng <jactry92 at gmail.com>
Date: Mon Apr 29 12:45:16 2013 +0800
msvcrt: Fixed typo of _strncoll and _strncoll_l.
---
dlls/msvcrt/mbcs.c | 2 +-
dlls/msvcrt/msvcrt.h | 2 +-
dlls/msvcrt/msvcrt.spec | 4 ++--
dlls/msvcrt/string.c | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index fdc5422..3d50d6c 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -819,7 +819,7 @@ int CDECL _mbsnbcoll_l(const unsigned char *str1, const unsigned char *str2, MSV
mbcinfo = locale->mbcinfo;
if(!mbcinfo->ismbcodepage)
- return MSVCRT_strncoll_l((const char*)str1, (const char*)str2, len, locale);
+ return MSVCRT__strncoll_l((const char*)str1, (const char*)str2, len, locale);
return CompareStringA(mbcinfo->mblcid, 0, (const char*)str1, len, (const char*)str2, len)-CSTR_EQUAL;
}
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index c688dea..b51ff81 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -987,7 +987,7 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_
int __cdecl MSVCRT__toupper_l(int,MSVCRT__locale_t);
int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t);
int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t);
-int __cdecl MSVCRT_strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t);
+int __cdecl MSVCRT__strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t);
unsigned int __cdecl _get_output_format(void);
/* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd)
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 725e191..0af2423 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -963,8 +963,8 @@
@ cdecl _strlwr_l(str ptr)
@ cdecl _strlwr_s(ptr long)
@ cdecl _strlwr_s_l(ptr long ptr)
-@ cdecl _strncoll(str str long) MSVCRT_strncoll_l
-@ cdecl _strncoll_l(str str long ptr) MSVCRT_strncoll
+@ cdecl _strncoll(str str long) MSVCRT__strncoll
+@ cdecl _strncoll_l(str str long ptr) MSVCRT__strncoll_l
@ cdecl _strnicmp(str str long) MSVCRT__strnicmp
@ cdecl _strnicmp_l(str str long ptr) MSVCRT__strnicmp_l
@ cdecl _strnicoll(str str long) MSVCRT__strnicoll
diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c
index 6049dce..9ad4cef 100644
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -527,7 +527,7 @@ int CDECL MSVCRT__stricoll( const char* str1, const char* str2 )
/*********************************************************************
* _strncoll_l (MSVCRT.@)
*/
-int CDECL MSVCRT_strncoll_l( const char* str1, const char* str2, MSVCRT_size_t count, MSVCRT__locale_t locale )
+int CDECL MSVCRT__strncoll_l( const char* str1, const char* str2, MSVCRT_size_t count, MSVCRT__locale_t locale )
{
MSVCRT_pthreadlocinfo locinfo;
@@ -540,11 +540,11 @@ int CDECL MSVCRT_strncoll_l( const char* str1, const char* str2, MSVCRT_size_t c
}
/*********************************************************************
- * strncoll (MSVCRT.@)
+ * _strncoll (MSVCRT.@)
*/
-int CDECL MSVCRT_strncoll( const char* str1, const char* str2, MSVCRT_size_t count )
+int CDECL MSVCRT__strncoll( const char* str1, const char* str2, MSVCRT_size_t count )
{
- return MSVCRT_strncoll_l(str1, str2, count, NULL);
+ return MSVCRT__strncoll_l(str1, str2, count, NULL);
}
/*********************************************************************
More information about the wine-cvs
mailing list