From d2fc8007d2356af4c8ee32b4ed24adadcf8fb1be Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Tue, 28 Aug 2012 00:40:39 +0200 Subject: [PATCH] msvcp100: Make some locale and string functions static. --- dlls/msvcp100/locale.c | 14 +++++++------- dlls/msvcp100/string.c | 38 +++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index 52a45bad02b..e7b9863f3f4 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -210,7 +210,7 @@ static struct list lazy_facets = LIST_INIT(lazy_facets); /* Not exported from msvcp90 */ /* ?facet_Register@facet@locale@std@@CAXPAV123@@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)); if(!head) { @@ -1238,7 +1238,7 @@ ctype_base* __thiscall ctype_base_vector_dtor(ctype_base *this, unsigned int fla } /* ?_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"); } @@ -2290,7 +2290,7 @@ ctype_wchar* ctype_wchar_use_facet(const locale *loc) 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; @@ -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@@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); @@ -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@@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); @@ -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@@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); @@ -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: * 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) { numpunct_char *numpunct = numpunct_char_use_facet(loc); diff --git a/dlls/msvcp100/string.c b/dlls/msvcp100/string.c index 3812a6599a7..ab1e7a87445 100644 --- a/dlls/msvcp100/string.c +++ b/dlls/msvcp100/string.c @@ -55,7 +55,7 @@ typedef struct { /* char_traits */ /* ?assign@?$char_traits@D@std@@SAXAADABD@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; } @@ -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@@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) { 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@@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); } /* ?_Copy_s@?$char_traits@D@std@@SAPADPADIPBDI@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) { if(!dest || !src || size */ /* ?assign@?$char_traits@_W@std@@SAXAA_WAB_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) { *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@@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) { 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@@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); } /* ?_Copy_s@?$char_traits@_W@std@@SAPA_WPA_WIPB_WI@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) { if(!dest || !src || size, allocator> */ /* ?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 */ -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@@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@@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); @@ -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@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 */ -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);