Francois Gouget : msvcp60: Make some codecvt_xxx() functions static or remove them.
Alexandre Julliard
julliard at winehq.org
Fri Nov 23 12:53:22 CST 2012
Module: wine
Branch: master
Commit: ebd28d5034c2a19d3ae7cd380a71e8a01c05095e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd28d5034c2a19d3ae7cd380a71e8a01c05095e
Author: Francois Gouget <fgouget at free.fr>
Date: Thu Nov 22 18:38:39 2012 +0100
msvcp60: Make some codecvt_xxx() functions static or remove them.
---
dlls/msvcp60/locale.c | 22 +---------------------
dlls/msvcp60/msvcp.h | 3 ---
2 files changed, 1 insertions(+), 24 deletions(-)
diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c
index 1ad21ae..80920c0 100644
--- a/dlls/msvcp60/locale.c
+++ b/dlls/msvcp60/locale.c
@@ -2551,15 +2551,6 @@ int __thiscall codecvt_char_do_unshift(const codecvt_char *this,
return CODECVT_noconv;
}
-/* ?unshift@?$codecvt at DDH@std@@QBEHAAHPAD1AAPAD at Z */
-/* ?unshift@?$codecvt at DDH@std@@QEBAHAEAHPEAD1AEAPEAD at Z */
-int codecvt_char_unshift(const codecvt_char *this,
- int *state, char *to, char *to_end, char **to_next)
-{
- TRACE("(%p %p %p %p %p)\n", this, state, to, to_end, to_next);
- return call_codecvt_char_do_unshift(this, state, to, to_end, to_next);
-}
-
/* ?do_length@?$codecvt at DDH@std@@MBEHABHPBD1I at Z */
/* ?do_length@?$codecvt at DDH@std@@MEBAHAEBHPEBD1_K at Z */
#define call_codecvt_char_do_length(this, state, from, from_end, max) CALL_VTBL_FUNC(this, 28, \
@@ -2696,7 +2687,7 @@ static MSVCP_size_t codecvt_wchar__Getcat(const locale_facet **facet, const loca
return LC_CTYPE;
}
-codecvt_wchar* codecvt_wchar_use_facet(const locale *loc)
+static codecvt_wchar* codecvt_wchar_use_facet(const locale *loc)
{
static codecvt_wchar *obj = NULL;
@@ -2926,17 +2917,6 @@ int __thiscall codecvt_wchar_do_unshift(const codecvt_wchar *this,
return CODECVT_ok;
}
-/* ?unshift@?$codecvt at GDH@std@@QBEHAAHPAD1AAPAD at Z */
-/* ?unshift@?$codecvt at GDH@std@@QEBAHAEAHPEAD1AEAPEAD at Z */
-/* ?unshift@?$codecvt at _WDH@std@@QBEHAAHPAD1AAPAD at Z */
-/* ?unshift@?$codecvt at _WDH@std@@QEBAHAEAHPEAD1AEAPEAD at Z */
-int codecvt_wchar_unshift(const codecvt_wchar *this,
- int *state, char *to, char *to_end, char **to_next)
-{
- TRACE("(%p %p %p %p %p)\n", this, state, to, to_end, to_next);
- return call_codecvt_wchar_do_unshift(this, state, to, to_end, to_next);
-}
-
/* ?do_length@?$codecvt at GDH@std@@MBEHABHPBD1I at Z */
/* ?do_length@?$codecvt at GDH@std@@MEBAHAEBHPEBD1_K at Z */
/* ?do_length@?$codecvt at _WDH@std@@MBEHABHPBD1I at Z */
diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h
index da23e31..cc0e688 100644
--- a/dlls/msvcp60/msvcp.h
+++ b/dlls/msvcp60/msvcp.h
@@ -107,7 +107,6 @@ typedef struct {
} codecvt_char;
MSVCP_bool __thiscall codecvt_base_always_noconv(const codecvt_base*);
-int codecvt_char_unshift(const codecvt_char*, int*, char*, char*, char**);
int __thiscall codecvt_char_out(const codecvt_char*, int*, const char*,
const char*, const char**, char*, char*, char**);
int __thiscall codecvt_char_in(const codecvt_char*, int*, const char*,
@@ -125,7 +124,6 @@ typedef struct {
_Cvtvec cvt;
} codecvt_wchar;
-int codecvt_wchar_unshift(const codecvt_wchar*, int*, char*, char*, char**);
int __thiscall codecvt_wchar_out(const codecvt_wchar*, int*, const wchar_t*,
const wchar_t*, const wchar_t**, char*, char*, char**);
int __thiscall codecvt_wchar_in(const codecvt_wchar*, int*, const char*,
@@ -171,7 +169,6 @@ void __thiscall locale_dtor(locale*);
void free_locale(void);
locale* __thiscall locale__Addfac(locale*, locale_facet*, MSVCP_size_t, MSVCP_size_t);
codecvt_char* codecvt_char_use_facet(const locale*);
-codecvt_wchar* codecvt_wchar_use_facet(const locale*);
codecvt_wchar* codecvt_short_use_facet(const locale*);
ctype_char* ctype_char_use_facet(const locale*);
ctype_wchar* ctype_wchar_use_facet(const locale*);
More information about the wine-cvs
mailing list