iconv sync 9/x: FreeBSD SVN 260003

In libiconv i18n modules, surround the unused static
_citrus_xxx_pack_state() and _citrus_xxx_unpack_state() functions
with #if 0 blocks for now

diff --git a/lib/i18n_module/BIG5/citrus_big5.c b/lib/i18n_module/BIG5/citrus_big5.c
index d28b5ee..7ad08d9 100644 (file)
--- a/lib/i18n_module/BIG5/citrus_big5.c
+++ b/lib/i18n_module/BIG5/citrus_big5.c
@@ -123,6 +123,7 @@ _citrus_BIG5_init_state(_BIG5EncodingInfo * __restrict ei __unused,
        memset(s, 0, sizeof(*s));
 }
 
+#if 0
 static __inline void
 /*ARGSUSED*/
 _citrus_BIG5_pack_state(_BIG5EncodingInfo * __restrict ei __unused,
@@ -142,6 +143,7 @@ _citrus_BIG5_unpack_state(_BIG5EncodingInfo * __restrict ei __unused,
 
        memcpy((void *)s, pspriv, sizeof(*s));
 }
+#endif
 
 static __inline int
 _citrus_BIG5_check(_BIG5EncodingInfo *ei, unsigned int c)

diff --git a/lib/i18n_module/DECHanyu/citrus_dechanyu.c b/lib/i18n_module/DECHanyu/citrus_dechanyu.c
index 5c43444..0464349 100644 (file)
--- a/lib/i18n_module/DECHanyu/citrus_dechanyu.c
+++ b/lib/i18n_module/DECHanyu/citrus_dechanyu.c
@@ -78,6 +78,7 @@ _citrus_DECHanyu_init_state(_DECHanyuEncodingInfo * __restrict ei __unused,
        psenc->chlen = 0;
 }
 
+#if 0
 static __inline void
 /*ARGSUSED*/
 _citrus_DECHanyu_pack_state(_DECHanyuEncodingInfo * __restrict ei __unused,
@@ -96,6 +97,7 @@ _citrus_DECHanyu_unpack_state(_DECHanyuEncodingInfo * __restrict ei __unused,
 
        memcpy((void *)psenc, pspriv, sizeof(*psenc));
 }
+#endif
 
 static void
 /*ARGSUSED*/

diff --git a/lib/i18n_module/EUC/citrus_euc.c b/lib/i18n_module/EUC/citrus_euc.c
index 4a616f9..0cc689a 100644 (file)
--- a/lib/i18n_module/EUC/citrus_euc.c
+++ b/lib/i18n_module/EUC/citrus_euc.c
@@ -169,6 +169,7 @@ _citrus_EUC_init_state(_EUCEncodingInfo *ei __unused, _EUCState *s)
        memset(s, 0, sizeof(*s));
 }
 
+#if 0
 static __inline void
 /*ARGSUSED*/
 _citrus_EUC_pack_state(_EUCEncodingInfo *ei __unused, void *pspriv,
@@ -186,6 +187,7 @@ _citrus_EUC_unpack_state(_EUCEncodingInfo *ei __unused, _EUCState *s,
 
        memcpy((void *)s, pspriv, sizeof(*s));
 }
+#endif
 
 static int
 _citrus_EUC_mbrtowc_priv(_EUCEncodingInfo *ei, wchar_t *pwc, char **s,

diff --git a/lib/i18n_module/EUCTW/citrus_euctw.c b/lib/i18n_module/EUCTW/citrus_euctw.c
index fd8014f..bd852fe 100644 (file)
--- a/lib/i18n_module/EUCTW/citrus_euctw.c
+++ b/lib/i18n_module/EUCTW/citrus_euctw.c
@@ -136,6 +136,7 @@ _citrus_EUCTW_init_state(_EUCTWEncodingInfo * __restrict ei __unused,
        memset(s, 0, sizeof(*s));
 }
 
+#if 0
 static __inline void
 /*ARGSUSED*/
 _citrus_EUCTW_pack_state(_EUCTWEncodingInfo * __restrict ei __unused,
@@ -153,6 +154,7 @@ _citrus_EUCTW_unpack_state(_EUCTWEncodingInfo * __restrict ei __unused,
 
        memcpy((void *)s, pspriv, sizeof(*s));
 }
+#endif
 
 static int
 /*ARGSUSED*/

diff --git a/lib/i18n_module/GBK2K/citrus_gbk2k.c b/lib/i18n_module/GBK2K/citrus_gbk2k.c
index 1f01106..fd30b06 100644 (file)
--- a/lib/i18n_module/GBK2K/citrus_gbk2k.c
+++ b/lib/i18n_module/GBK2K/citrus_gbk2k.c
@@ -80,6 +80,7 @@ _citrus_GBK2K_init_state(_GBK2KEncodingInfo * __restrict ei __unused,
        memset(s, 0, sizeof(*s));
 }
 
+#if 0
 static __inline void
 /*ARGSUSED*/
 _citrus_GBK2K_pack_state(_GBK2KEncodingInfo * __restrict ei __unused,
@@ -97,6 +98,7 @@ _citrus_GBK2K_unpack_state(_GBK2KEncodingInfo * __restrict ei __unused,
 
        memcpy((void *)s, pspriv, sizeof(*s));
 }
+#endif
 
 static  __inline bool
 _mb_singlebyte(int c)

diff --git a/lib/i18n_module/HZ/citrus_hz.c b/lib/i18n_module/HZ/citrus_hz.c
index c843d12..c773324 100644 (file)
--- a/lib/i18n_module/HZ/citrus_hz.c
+++ b/lib/i18n_module/HZ/citrus_hz.c
@@ -153,6 +153,7 @@ _citrus_HZ_init_state(_HZEncodingInfo * __restrict ei,
        psenc->inuse = INIT0(ei);
 }
 
+#if 0
 static __inline void
 /*ARGSUSED*/
 _citrus_HZ_pack_state(_HZEncodingInfo * __restrict ei __unused,
@@ -170,6 +171,7 @@ _citrus_HZ_unpack_state(_HZEncodingInfo * __restrict ei __unused,
 
        memcpy((void *)psenc, pspriv, sizeof(*psenc));
 }
+#endif
 
 static int
 _citrus_HZ_mbrtowc_priv(_HZEncodingInfo * __restrict ei,

diff --git a/lib/i18n_module/ISO2022/citrus_iso2022.c b/lib/i18n_module/ISO2022/citrus_iso2022.c
index ad8400d..bc1b730 100644 (file)
--- a/lib/i18n_module/ISO2022/citrus_iso2022.c
+++ b/lib/i18n_module/ISO2022/citrus_iso2022.c
@@ -444,6 +444,7 @@ _citrus_ISO2022_init_state(_ISO2022EncodingInfo * __restrict ei,
        s->flags |= _ISO2022STATE_FLAG_INITIALIZED;
 }
 
+#if 0
 static __inline void
 /*ARGSUSED*/
 _citrus_ISO2022_pack_state(_ISO2022EncodingInfo * __restrict ei __unused,
@@ -461,6 +462,7 @@ _citrus_ISO2022_unpack_state(_ISO2022EncodingInfo * __restrict ei __unused,
 
        memcpy((void *)s, pspriv, sizeof(*s));
 }
+#endif
 
 static int
 /*ARGSUSED*/

diff --git a/lib/i18n_module/JOHAB/citrus_johab.c b/lib/i18n_module/JOHAB/citrus_johab.c
index dfc4760..681102c 100644 (file)
--- a/lib/i18n_module/JOHAB/citrus_johab.c
+++ b/lib/i18n_module/JOHAB/citrus_johab.c
@@ -80,6 +80,7 @@ _citrus_JOHAB_init_state(_JOHABEncodingInfo * __restrict ei __unused,
        psenc->chlen = 0;
 }
 
+#if 0
 static __inline void
 /*ARGSUSED*/
 _citrus_JOHAB_pack_state(_JOHABEncodingInfo * __restrict ei __unused,
@@ -97,6 +98,7 @@ _citrus_JOHAB_unpack_state(_JOHABEncodingInfo * __restrict ei __unused,
 
        memcpy((void *)psenc, pspriv, sizeof(*psenc));
 }
+#endif
 
 static void
 /*ARGSUSED*/

diff --git a/lib/i18n_module/MSKanji/citrus_mskanji.c b/lib/i18n_module/MSKanji/citrus_mskanji.c
index 7336bc5..2444bb8 100644 (file)
--- a/lib/i18n_module/MSKanji/citrus_mskanji.c
+++ b/lib/i18n_module/MSKanji/citrus_mskanji.c
@@ -130,6 +130,7 @@ _citrus_MSKanji_init_state(_MSKanjiEncodingInfo * __restrict ei __unused,
        s->chlen = 0;
 }
 
+#if 0
 static __inline void
 /*ARGSUSED*/
 _citrus_MSKanji_pack_state(_MSKanjiEncodingInfo * __restrict ei __unused,
@@ -147,6 +148,7 @@ _citrus_MSKanji_unpack_state(_MSKanjiEncodingInfo * __restrict ei __unused,
 
        memcpy((void *)s, pspriv, sizeof(*s));
 }
+#endif
 
 static int
 /*ARGSUSED*/

diff --git a/lib/i18n_module/UES/citrus_ues.c b/lib/i18n_module/UES/citrus_ues.c
index 3ae3b1a..5a35888 100644 (file)
--- a/lib/i18n_module/UES/citrus_ues.c
+++ b/lib/i18n_module/UES/citrus_ues.c
@@ -75,6 +75,7 @@ _citrus_UES_init_state(_UESEncodingInfo * __restrict ei __unused,
        psenc->chlen = 0;
 }
 
+#if 0
 static __inline void
 /*ARGSUSED*/
 _citrus_UES_pack_state(_UESEncodingInfo * __restrict ei __unused,
@@ -92,6 +93,7 @@ _citrus_UES_unpack_state(_UESEncodingInfo * __restrict ei __unused,
 
        memcpy((void *)psenc, pspriv, sizeof(*psenc));
 }
+#endif
 
 static __inline int
 to_int(int ch)

diff --git a/lib/i18n_module/UTF7/citrus_utf7.c b/lib/i18n_module/UTF7/citrus_utf7.c
index 03deccd..8929426 100644 (file)
--- a/lib/i18n_module/UTF7/citrus_utf7.c
+++ b/lib/i18n_module/UTF7/citrus_utf7.c
@@ -87,6 +87,7 @@ _citrus_UTF7_init_state(_UTF7EncodingInfo * __restrict ei __unused,
        memset((void *)s, 0, sizeof(*s));
 }
 
+#if 0
 static __inline void
 /*ARGSUSED*/
 _citrus_UTF7_pack_state(_UTF7EncodingInfo * __restrict ei __unused,
@@ -104,6 +105,7 @@ _citrus_UTF7_unpack_state(_UTF7EncodingInfo * __restrict ei __unused,
 
        memcpy((void *)s, pspriv, sizeof(*s));
 }
+#endif
 
 static const char base64[] =
        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"

diff --git a/lib/i18n_module/UTF8/citrus_utf8.c b/lib/i18n_module/UTF8/citrus_utf8.c
index eda7a0d..85f62fd 100644 (file)
--- a/lib/i18n_module/UTF8/citrus_utf8.c
+++ b/lib/i18n_module/UTF8/citrus_utf8.c
@@ -156,6 +156,7 @@ _citrus_UTF8_init_state(_UTF8EncodingInfo *ei __unused, _UTF8State *s)
        s->chlen = 0;
 }
 
+#if 0
 static __inline void
 /*ARGSUSED*/
 _citrus_UTF8_pack_state(_UTF8EncodingInfo *ei __unused, void *pspriv,
@@ -173,6 +174,7 @@ _citrus_UTF8_unpack_state(_UTF8EncodingInfo *ei __unused, _UTF8State *s,
 
        memcpy((void *)s, pspriv, sizeof(*s));
 }
+#endif
 
 static int
 _citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo *ei, wchar_t *pwc, char **s,

diff --git a/lib/i18n_module/VIQR/citrus_viqr.c b/lib/i18n_module/VIQR/citrus_viqr.c
index 446f6f5..0d51e29 100644 (file)
--- a/lib/i18n_module/VIQR/citrus_viqr.c
+++ b/lib/i18n_module/VIQR/citrus_viqr.c
@@ -230,6 +230,7 @@ _citrus_VIQR_init_state(_VIQREncodingInfo * __restrict ei __unused,
        psenc->chlen = 0;
 }
 
+#if 0
 static __inline void
 /*ARGSUSED*/
 _citrus_VIQR_pack_state(_VIQREncodingInfo * __restrict ei __unused,
@@ -247,6 +248,7 @@ _citrus_VIQR_unpack_state(_VIQREncodingInfo * __restrict ei __unused,
 
        memcpy((void *)psenc, pspriv, sizeof(*psenc));
 }
+#endif
 
 static int
 _citrus_VIQR_mbrtowc_priv(_VIQREncodingInfo * __restrict ei,

diff --git a/lib/i18n_module/ZW/citrus_zw.c b/lib/i18n_module/ZW/citrus_zw.c
index 271cfaa..843308f 100644 (file)
--- a/lib/i18n_module/ZW/citrus_zw.c
+++ b/lib/i18n_module/ZW/citrus_zw.c
@@ -85,6 +85,7 @@ _citrus_ZW_init_state(_ZWEncodingInfo * __restrict ei __unused,
        psenc->charset = NONE;
 }
 
+#if 0
 static __inline void
 /*ARGSUSED*/
 _citrus_ZW_pack_state(_ZWEncodingInfo * __restrict ei __unused,
@@ -102,6 +103,7 @@ _citrus_ZW_unpack_state(_ZWEncodingInfo * __restrict ei __unused,
 
        memcpy((void *)psenc, pspriv, sizeof(*psenc));
 }
+#endif
 
 static int
 _citrus_ZW_mbrtowc_priv(_ZWEncodingInfo * __restrict ei,