[1/2] msvcp100: Make some locale and string functions static.
Francois Gouget
fgouget at free.fr
Mon Aug 27 17:40:39 CDT 2012
---
This also make a variable static: MSVCP_basic_string_char_npos
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 52a45ba..e7b9863 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 at facet@locale at std@@CAXPAV123@@Z */
/* ?facet_Register at facet@locale at 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 at 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>");
}
@@ -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 at D@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z */
/* ?_Getcat@?$numpunct at D@std@@SA_KPEAPEBVfacet at locale@2 at 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 at _W@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z */
/* ?_Getcat@?$numpunct at _W@std@@SA_KPEAPEBVfacet at locale@2 at 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 at G@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z */
/* ?_Getcat@?$numpunct at G@std@@SA_KPEAPEBVfacet at locale@2 at 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 3812a65..ab1e7a8 100644
--- a/dlls/msvcp100/string.c
+++ b/dlls/msvcp100/string.c
@@ -55,7 +55,7 @@ typedef struct {
/* char_traits<char> */
/* ?assign@?$char_traits at D@std@@SAXAADABD at Z */
/* ?assign@?$char_traits at D@std@@SAXAEADAEBD at 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 at D@std@@SAHPBD0I at Z */
/* ?compare@?$char_traits at D@std@@SAHPEBD0_K at 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 at D@std@@SAIPBD at Z */
/* ?length@?$char_traits at D@std@@SA_KPEBD at 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 at D@std@@SAPADPADIPBDI at Z */
/* ?_Copy_s@?$char_traits at D@std@@SAPEADPEAD_KPEBD1 at 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<count) {
@@ -115,7 +115,7 @@ char* CDECL MSVCP_char_traits_char_copy(
/* ?find@?$char_traits at D@std@@SAPBDPBDIABD at Z */
/* ?find@?$char_traits at D@std@@SAPEBDPEBD_KAEBD at 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)
{
return memchr(str, *c, range);
@@ -123,7 +123,7 @@ const char * CDECL MSVCP_char_traits_char_find(
/* ?_Move_s@?$char_traits at D@std@@SAPADPADIPBDI at Z */
/* ?_Move_s@?$char_traits at D@std@@SAPEADPEAD_KPEBD1 at 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)
{
if(!dest || !src || size<count) {
@@ -146,7 +146,7 @@ char* CDECL MSVCP_char_traits_char_move(
/* ?assign@?$char_traits at D@std@@SAPADPADID at Z */
/* ?assign@?$char_traits at D@std@@SAPEADPEAD_KD at 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);
}
@@ -189,7 +189,7 @@ int CDECL MSVCP_char_traits_char_not_eof(int *in)
/* char_traits<wchar_t> */
/* ?assign@?$char_traits at _W@std@@SAXAA_WAB_W at Z */
/* ?assign@?$char_traits at _W@std@@SAXAEA_WAEB_W at 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 at _W@std@@SAHPB_W0I at Z */
/* ?compare@?$char_traits at _W@std@@SAHPEB_W0_K at 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 at _W@std@@SAIPB_W at Z */
/* ?length@?$char_traits at _W@std@@SA_KPEB_W at 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 at _W@std@@SAPA_WPA_WIPB_WI at Z */
/* ?_Copy_s@?$char_traits at _W@std@@SAPEA_WPEA_W_KPEB_W1 at 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<count) {
@@ -251,7 +251,7 @@ wchar_t* CDECL MSVCP_char_traits_wchar_copy(wchar_t *dest,
/* ?find@?$char_traits at _W@std@@SAPB_WPB_WIAB_W at Z */
/* ?find@?$char_traits at _W@std@@SAPEB_WPEB_W_KAEB_W at 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)
{
MSVCP_size_t i=0;
@@ -265,7 +265,7 @@ const wchar_t* CDECL MSVCP_char_traits_wchar_find(
/* ?_Move_s@?$char_traits at _W@std@@SAPA_WPA_WIPB_WI at Z */
/* ?_Move_s@?$char_traits at _W@std@@SAPEA_WPEA_W_KPEB_W1 at 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)
{
if(!dest || !src || size<count) {
@@ -288,7 +288,7 @@ wchar_t* CDECL MSVCP_char_traits_wchar_move(wchar_t *dest,
/* ?assign@?$char_traits at _W@std@@SAPA_WPA_WI_W at Z */
/* ?assign@?$char_traits at _W@std@@SAPEA_WPEA_W_K_W at 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 i;
@@ -492,7 +492,7 @@ unsigned short CDECL MSVCP_char_traits_short_not_eof(const unsigned short *in)
/* _String_base */
/* ?_Xlen at _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";
@@ -501,7 +501,7 @@ void CDECL MSVCP__String_base_Xlen(void)
}
/* ?_Xran at _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";
@@ -522,7 +522,7 @@ void CDECL MSVCP__String_base_Xinvarg(void)
/* basic_string<char, char_traits<char>, allocator<char>> */
/* ?npos@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@2IB */
/* ?npos@?$basic_string at DU?$char_traits at D@std@@V?$allocator at 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 at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@IAEPADXZ */
/* ?_Myptr@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@IEAAPEADXZ */
@@ -649,7 +649,7 @@ void __thiscall basic_string_char__Copy(basic_string_char *this,
/* ?_Pdif@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@KAIV?$_String_const_iterator at DU?$char_traits at D@std@@V?$allocator at D@2@@2 at 0@Z */
/* ?_Pdif@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@KA_KV?$_String_const_iterator at DU?$char_traits at D@std@@V?$allocator at D@2@@2 at 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 at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@KA_KV?$_String_const_iterator at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@2 at 0@Z */
/* ?_Pdif@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@KAIV?$_String_const_iterator at GU?$char_traits at G@std@@V?$allocator at G@2@@2 at 0@Z */
/* ?_Pdif@?$basic_string at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@KA_KV?$_String_const_iterator at GU?$char_traits at G@std@@V?$allocator at G@2@@2 at 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);
--
1.7.10.4
More information about the wine-patches
mailing list