ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcp100: Make some locale and string functions static.

This commit is contained in:
Francois Gouget 2012-08-28 00:40:39 +02:00 committed by Alexandre Julliard
parent 284f3cc047
commit d2fc8007d2
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/msvcp100/locale.c
View File

@ -210,7 +210,7 @@ static struct list lazy_facets = LIST_INIT(lazy_facets);
/* Not exported from msvcp90 */ /* Not exported from msvcp90 */
/* ?facet_Register@facet@locale@std@@CAXPAV123@@Z */ /* ?facet_Register@facet@locale@std@@CAXPAV123@@Z */
/* ?facet_Register@facet@locale@std@@CAXPEAV123@@Z */ /* ?facet_Register@facet@locale@std@@CAXPEAV123@@Z */
void __cdecl locale_facet_register(locale_facet *add) static void __cdecl locale_facet_register(locale_facet *add)
{ {
facets_elem *head = MSVCRT_operator_new(sizeof(*head)); facets_elem *head = MSVCRT_operator_new(sizeof(*head));
if(!head) { if(!head) {
@ -1238,7 +1238,7 @@ ctype_base* __thiscall ctype_base_vector_dtor(ctype_base *this, unsigned int fla
} }
/* ?_Xran@ctype_base@std@@KAXXZ */ /* ?_Xran@ctype_base@std@@KAXXZ */
void __cdecl ctype_base__Xran(void) static void __cdecl ctype_base__Xran(void)
{ {
throw_exception(EXCEPTION_OUT_OF_RANGE, "out of range in ctype<T>"); throw_exception(EXCEPTION_OUT_OF_RANGE, "out of range in ctype<T>");
} }
@ -2290,7 +2290,7 @@ ctype_wchar* ctype_wchar_use_facet(const locale *loc)
return obj; return obj;
} }
ctype_wchar* ctype_short_use_facet(const locale *loc) static ctype_wchar* ctype_short_use_facet(const locale *loc)
{ {
static ctype_wchar *obj = NULL; static ctype_wchar *obj = NULL;
@ -3503,7 +3503,7 @@ numpunct_char* __thiscall numpunct_char_vector_dtor(numpunct_char *this, unsigne
/* ?_Getcat@?$numpunct@D@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */ /* ?_Getcat@?$numpunct@D@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */
/* ?_Getcat@?$numpunct@D@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */ /* ?_Getcat@?$numpunct@D@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */
MSVCP_size_t __cdecl numpunct_char__Getcat(const locale_facet **facet, const locale *loc) static MSVCP_size_t __cdecl numpunct_char__Getcat(const locale_facet **facet, const locale *loc)
{ {
TRACE("(%p %p)\n", facet, loc); TRACE("(%p %p)\n", facet, loc);
@ -3856,7 +3856,7 @@ numpunct_wchar* __thiscall numpunct_wchar_vector_dtor(numpunct_wchar *this, unsi
/* ?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */ /* ?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */
/* ?_Getcat@?$numpunct@_W@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */ /* ?_Getcat@?$numpunct@_W@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */
MSVCP_size_t __cdecl numpunct_wchar__Getcat(const locale_facet **facet, const locale *loc) static MSVCP_size_t __cdecl numpunct_wchar__Getcat(const locale_facet **facet, const locale *loc)
{ {
TRACE("(%p %p)\n", facet, loc); TRACE("(%p %p)\n", facet, loc);
@ -3904,7 +3904,7 @@ static numpunct_wchar* numpunct_wchar_use_facet(const locale *loc)
/* ?_Getcat@?$numpunct@G@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */ /* ?_Getcat@?$numpunct@G@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */
/* ?_Getcat@?$numpunct@G@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */ /* ?_Getcat@?$numpunct@G@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */
MSVCP_size_t __cdecl numpunct_short__Getcat(const locale_facet **facet, const locale *loc) static MSVCP_size_t __cdecl numpunct_short__Getcat(const locale_facet **facet, const locale *loc)
{ {
TRACE("(%p %p)\n", facet, loc); TRACE("(%p %p)\n", facet, loc);
@ -5500,7 +5500,7 @@ num_get* num_get_char_use_facet(const locale *loc)
* Size of dest buffer is not specified, assuming it's not smaller than 32: * Size of dest buffer is not specified, assuming it's not smaller than 32:
* strlen(+0.e+) + 22(digits) + 4(expontent) + 1(nullbyte) * strlen(+0.e+) + 22(digits) + 4(expontent) + 1(nullbyte)
*/ */
int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_iterator_char *first, static int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_iterator_char *first,
istreambuf_iterator_char *last, const locale *loc) istreambuf_iterator_char *last, const locale *loc)
{ {
numpunct_char *numpunct = numpunct_char_use_facet(loc); numpunct_char *numpunct = numpunct_char_use_facet(loc);

38
dlls/msvcp100/string.c
View File

@ -55,7 +55,7 @@ typedef struct {
/* char_traits<char> */ /* char_traits<char> */
/* ?assign@?$char_traits@D@std@@SAXAADABD@Z */ /* ?assign@?$char_traits@D@std@@SAXAADABD@Z */
/* ?assign@?$char_traits@D@std@@SAXAEADAEBD@Z */ /* ?assign@?$char_traits@D@std@@SAXAEADAEBD@Z */
void CDECL MSVCP_char_traits_char_assign(char *ch, const char *assign) static void CDECL MSVCP_char_traits_char_assign(char *ch, const char *assign)
{ {
*ch = *assign; *ch = *assign;
} }
@ -76,7 +76,7 @@ MSVCP_bool CDECL MSVCP_char_traits_lt(const char *ch1, const char *ch2)
/* ?compare@?$char_traits@D@std@@SAHPBD0I@Z */ /* ?compare@?$char_traits@D@std@@SAHPBD0I@Z */
/* ?compare@?$char_traits@D@std@@SAHPEBD0_K@Z */ /* ?compare@?$char_traits@D@std@@SAHPEBD0_K@Z */
int CDECL MSVCP_char_traits_char_compare( static int CDECL MSVCP_char_traits_char_compare(
const char *s1, const char *s2, MSVCP_size_t count) const char *s1, const char *s2, MSVCP_size_t count)
{ {
int ret = memcmp(s1, s2, count); int ret = memcmp(s1, s2, count);
@ -85,14 +85,14 @@ int CDECL MSVCP_char_traits_char_compare(
/* ?length@?$char_traits@D@std@@SAIPBD@Z */ /* ?length@?$char_traits@D@std@@SAIPBD@Z */
/* ?length@?$char_traits@D@std@@SA_KPEBD@Z */ /* ?length@?$char_traits@D@std@@SA_KPEBD@Z */
MSVCP_size_t CDECL MSVCP_char_traits_char_length(const char *str) static MSVCP_size_t CDECL MSVCP_char_traits_char_length(const char *str)
{ {
return strlen(str); return strlen(str);
} }
/* ?_Copy_s@?$char_traits@D@std@@SAPADPADIPBDI@Z */ /* ?_Copy_s@?$char_traits@D@std@@SAPADPADIPBDI@Z */
/* ?_Copy_s@?$char_traits@D@std@@SAPEADPEAD_KPEBD1@Z */ /* ?_Copy_s@?$char_traits@D@std@@SAPEADPEAD_KPEBD1@Z */
char* CDECL MSVCP_char_traits_char__Copy_s(char *dest, static char* CDECL MSVCP_char_traits_char__Copy_s(char *dest,
MSVCP_size_t size, const char *src, MSVCP_size_t count) MSVCP_size_t size, const char *src, MSVCP_size_t count)
{ {
if(!dest || !src || size<count) { if(!dest || !src || size<count) {
@ -115,7 +115,7 @@ char* CDECL MSVCP_char_traits_char_copy(
/* ?find@?$char_traits@D@std@@SAPBDPBDIABD@Z */ /* ?find@?$char_traits@D@std@@SAPBDPBDIABD@Z */
/* ?find@?$char_traits@D@std@@SAPEBDPEBD_KAEBD@Z */ /* ?find@?$char_traits@D@std@@SAPEBDPEBD_KAEBD@Z */
const char * CDECL MSVCP_char_traits_char_find( static const char * CDECL MSVCP_char_traits_char_find(
const char *str, MSVCP_size_t range, const char *c) const char *str, MSVCP_size_t range, const char *c)
{ {
return memchr(str, *c, range); return memchr(str, *c, range);
@ -123,7 +123,7 @@ const char * CDECL MSVCP_char_traits_char_find(
/* ?_Move_s@?$char_traits@D@std@@SAPADPADIPBDI@Z */ /* ?_Move_s@?$char_traits@D@std@@SAPADPADIPBDI@Z */
/* ?_Move_s@?$char_traits@D@std@@SAPEADPEAD_KPEBD1@Z */ /* ?_Move_s@?$char_traits@D@std@@SAPEADPEAD_KPEBD1@Z */
char* CDECL MSVCP_char_traits_char__Move_s(char *dest, static char* CDECL MSVCP_char_traits_char__Move_s(char *dest,
MSVCP_size_t size, const char *src, MSVCP_size_t count) MSVCP_size_t size, const char *src, MSVCP_size_t count)
{ {
if(!dest || !src || size<count) { if(!dest || !src || size<count) {
@ -146,7 +146,7 @@ char* CDECL MSVCP_char_traits_char_move(
/* ?assign@?$char_traits@D@std@@SAPADPADID@Z */ /* ?assign@?$char_traits@D@std@@SAPADPADID@Z */
/* ?assign@?$char_traits@D@std@@SAPEADPEAD_KD@Z */ /* ?assign@?$char_traits@D@std@@SAPEADPEAD_KD@Z */
char* CDECL MSVCP_char_traits_char_assignn(char *str, MSVCP_size_t num, char c) static char* CDECL MSVCP_char_traits_char_assignn(char *str, MSVCP_size_t num, char c)
{ {
return memset(str, c, num); return memset(str, c, num);
} }
@ -189,7 +189,7 @@ int CDECL MSVCP_char_traits_char_not_eof(int *in)
/* char_traits<wchar_t> */ /* char_traits<wchar_t> */
/* ?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z */ /* ?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z */
/* ?assign@?$char_traits@_W@std@@SAXAEA_WAEB_W@Z */ /* ?assign@?$char_traits@_W@std@@SAXAEA_WAEB_W@Z */
void CDECL MSVCP_char_traits_wchar_assign(wchar_t *ch, static void CDECL MSVCP_char_traits_wchar_assign(wchar_t *ch,
const wchar_t *assign) const wchar_t *assign)
{ {
*ch = *assign; *ch = *assign;
@ -212,7 +212,7 @@ MSVCP_bool CDECL MSVCP_char_traits_wchar_lt(const wchar_t *ch1,
/* ?compare@?$char_traits@_W@std@@SAHPB_W0I@Z */ /* ?compare@?$char_traits@_W@std@@SAHPB_W0I@Z */
/* ?compare@?$char_traits@_W@std@@SAHPEB_W0_K@Z */ /* ?compare@?$char_traits@_W@std@@SAHPEB_W0_K@Z */
int CDECL MSVCP_char_traits_wchar_compare(const wchar_t *s1, static int CDECL MSVCP_char_traits_wchar_compare(const wchar_t *s1,
const wchar_t *s2, MSVCP_size_t count) const wchar_t *s2, MSVCP_size_t count)
{ {
int ret = memcmp(s1, s2, count * sizeof(wchar_t)); int ret = memcmp(s1, s2, count * sizeof(wchar_t));
@ -221,14 +221,14 @@ int CDECL MSVCP_char_traits_wchar_compare(const wchar_t *s1,
/* ?length@?$char_traits@_W@std@@SAIPB_W@Z */ /* ?length@?$char_traits@_W@std@@SAIPB_W@Z */
/* ?length@?$char_traits@_W@std@@SA_KPEB_W@Z */ /* ?length@?$char_traits@_W@std@@SA_KPEB_W@Z */
MSVCP_size_t CDECL MSVCP_char_traits_wchar_length(const wchar_t *str) static MSVCP_size_t CDECL MSVCP_char_traits_wchar_length(const wchar_t *str)
{ {
return wcslen((WCHAR*)str); return wcslen((WCHAR*)str);
} }
/* ?_Copy_s@?$char_traits@_W@std@@SAPA_WPA_WIPB_WI@Z */ /* ?_Copy_s@?$char_traits@_W@std@@SAPA_WPA_WIPB_WI@Z */
/* ?_Copy_s@?$char_traits@_W@std@@SAPEA_WPEA_W_KPEB_W1@Z */ /* ?_Copy_s@?$char_traits@_W@std@@SAPEA_WPEA_W_KPEB_W1@Z */
wchar_t* CDECL MSVCP_char_traits_wchar__Copy_s(wchar_t *dest, static wchar_t* CDECL MSVCP_char_traits_wchar__Copy_s(wchar_t *dest,
MSVCP_size_t size, const wchar_t *src, MSVCP_size_t count) MSVCP_size_t size, const wchar_t *src, MSVCP_size_t count)
{ {
if(!dest || !src || size<count) { if(!dest || !src || size<count) {
@ -251,7 +251,7 @@ wchar_t* CDECL MSVCP_char_traits_wchar_copy(wchar_t *dest,
/* ?find@?$char_traits@_W@std@@SAPB_WPB_WIAB_W@Z */ /* ?find@?$char_traits@_W@std@@SAPB_WPB_WIAB_W@Z */
/* ?find@?$char_traits@_W@std@@SAPEB_WPEB_W_KAEB_W@Z */ /* ?find@?$char_traits@_W@std@@SAPEB_WPEB_W_KAEB_W@Z */
const wchar_t* CDECL MSVCP_char_traits_wchar_find( static const wchar_t* CDECL MSVCP_char_traits_wchar_find(
const wchar_t *str, MSVCP_size_t range, const wchar_t *c) const wchar_t *str, MSVCP_size_t range, const wchar_t *c)
{ {
MSVCP_size_t i=0; MSVCP_size_t i=0;
@ -265,7 +265,7 @@ const wchar_t* CDECL MSVCP_char_traits_wchar_find(
/* ?_Move_s@?$char_traits@_W@std@@SAPA_WPA_WIPB_WI@Z */ /* ?_Move_s@?$char_traits@_W@std@@SAPA_WPA_WIPB_WI@Z */
/* ?_Move_s@?$char_traits@_W@std@@SAPEA_WPEA_W_KPEB_W1@Z */ /* ?_Move_s@?$char_traits@_W@std@@SAPEA_WPEA_W_KPEB_W1@Z */
wchar_t* CDECL MSVCP_char_traits_wchar__Move_s(wchar_t *dest, static wchar_t* CDECL MSVCP_char_traits_wchar__Move_s(wchar_t *dest,
MSVCP_size_t size, const wchar_t *src, MSVCP_size_t count) MSVCP_size_t size, const wchar_t *src, MSVCP_size_t count)
{ {
if(!dest || !src || size<count) { if(!dest || !src || size<count) {
@ -288,7 +288,7 @@ wchar_t* CDECL MSVCP_char_traits_wchar_move(wchar_t *dest,
/* ?assign@?$char_traits@_W@std@@SAPA_WPA_WI_W@Z */ /* ?assign@?$char_traits@_W@std@@SAPA_WPA_WI_W@Z */
/* ?assign@?$char_traits@_W@std@@SAPEA_WPEA_W_K_W@Z */ /* ?assign@?$char_traits@_W@std@@SAPEA_WPEA_W_K_W@Z */
wchar_t* CDECL MSVCP_char_traits_wchar_assignn(wchar_t *str, static wchar_t* CDECL MSVCP_char_traits_wchar_assignn(wchar_t *str,
MSVCP_size_t num, wchar_t c) MSVCP_size_t num, wchar_t c)
{ {
MSVCP_size_t i; MSVCP_size_t i;
@ -492,7 +492,7 @@ unsigned short CDECL MSVCP_char_traits_short_not_eof(const unsigned short *in)
/* _String_base */ /* _String_base */
/* ?_Xlen@_String_base@std@@SAXXZ */ /* ?_Xlen@_String_base@std@@SAXXZ */
void CDECL MSVCP__String_base_Xlen(void) static void CDECL MSVCP__String_base_Xlen(void)
{ {
static const char msg[] = "string too long"; static const char msg[] = "string too long";
@ -501,7 +501,7 @@ void CDECL MSVCP__String_base_Xlen(void)
} }
/* ?_Xran@_String_base@std@@SAXXZ */ /* ?_Xran@_String_base@std@@SAXXZ */
void CDECL MSVCP__String_base_Xran(void) static void CDECL MSVCP__String_base_Xran(void)
{ {
static const char msg[] = "invalid string position"; static const char msg[] = "invalid string position";
@ -522,7 +522,7 @@ void CDECL MSVCP__String_base_Xinvarg(void)
/* basic_string<char, char_traits<char>, allocator<char>> */ /* basic_string<char, char_traits<char>, allocator<char>> */
/* ?npos@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@2IB */ /* ?npos@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@2IB */
/* ?npos@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@2_KB */ /* ?npos@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@2_KB */
const MSVCP_size_t MSVCP_basic_string_char_npos = -1; static const MSVCP_size_t MSVCP_basic_string_char_npos = -1;
/* ?_Myptr@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@IAEPADXZ */ /* ?_Myptr@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@IAEPADXZ */
/* ?_Myptr@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@IEAAPEADXZ */ /* ?_Myptr@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@IEAAPEADXZ */
@ -649,7 +649,7 @@ void __thiscall basic_string_char__Copy(basic_string_char *this,
/* ?_Pdif@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@KAIV?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@0@Z */ /* ?_Pdif@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@KAIV?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@0@Z */
/* ?_Pdif@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@KA_KV?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@0@Z */ /* ?_Pdif@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@KA_KV?$_String_const_iterator@DU?$char_traits@D@std@@V?$allocator@D@2@@2@0@Z */
MSVCP_size_t __cdecl MSVCP_basic_string_char_Pdif(String_iterator_char i1, String_iterator_char i2) static MSVCP_size_t __cdecl MSVCP_basic_string_char_Pdif(String_iterator_char i1, String_iterator_char i2)
{ {
TRACE("(%p %p) (%p %p)\n", i1.bstr, i1.pos, i2.bstr, i2.pos); TRACE("(%p %p) (%p %p)\n", i1.bstr, i1.pos, i2.bstr, i2.pos);
@ -2467,7 +2467,7 @@ void __thiscall basic_string_wchar__Copy(basic_string_wchar *this,
/* ?_Pdif@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@KA_KV?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@0@Z */ /* ?_Pdif@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@KA_KV?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@0@Z */
/* ?_Pdif@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@KAIV?$_String_const_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@0@Z */ /* ?_Pdif@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@KAIV?$_String_const_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@0@Z */
/* ?_Pdif@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@KA_KV?$_String_const_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@0@Z */ /* ?_Pdif@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@KA_KV?$_String_const_iterator@GU?$char_traits@G@std@@V?$allocator@G@2@@2@0@Z */
MSVCP_size_t __cdecl MSVCP_basic_string_wchar_Pdif(String_iterator_wchar i1, String_iterator_wchar i2) static MSVCP_size_t __cdecl MSVCP_basic_string_wchar_Pdif(String_iterator_wchar i1, String_iterator_wchar i2)
{ {
TRACE("(%p %p) (%p %p)\n", i1.bstr, i1.pos, i2.bstr, i2.pos); TRACE("(%p %p) (%p %p)\n", i1.bstr, i1.pos, i2.bstr, i2.pos);