In libiconv_modules, surround unused static _citrus_XXX_pack_state() and

DimitryAndric · DimitryAndric · commit a253cb94e9d1 · 2013-12-28T13:49:48.000Z
_citrus_XXX_unpack_state() functions with #if 0, for now.

MFC after:	3 days
diff --git a/lib/libiconv_modules/BIG5/citrus_big5.c b/lib/libiconv_modules/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/libiconv_modules/DECHanyu/citrus_dechanyu.c b/lib/libiconv_modules/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/libiconv_modules/EUC/citrus_euc.c b/lib/libiconv_modules/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, const char **s,
diff --git a/lib/libiconv_modules/EUCTW/citrus_euctw.c b/lib/libiconv_modules/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/libiconv_modules/GBK2K/citrus_gbk2k.c b/lib/libiconv_modules/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/libiconv_modules/HZ/citrus_hz.c b/lib/libiconv_modules/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/libiconv_modules/ISO2022/citrus_iso2022.c b/lib/libiconv_modules/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/libiconv_modules/JOHAB/citrus_johab.c b/lib/libiconv_modules/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/libiconv_modules/MSKanji/citrus_mskanji.c b/lib/libiconv_modules/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/libiconv_modules/UES/citrus_ues.c b/lib/libiconv_modules/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/libiconv_modules/UTF7/citrus_utf7.c b/lib/libiconv_modules/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/libiconv_modules/UTF8/citrus_utf8.c b/lib/libiconv_modules/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, const char **s,
diff --git a/lib/libiconv_modules/VIQR/citrus_viqr.c b/lib/libiconv_modules/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/libiconv_modules/ZW/citrus_zw.c b/lib/libiconv_modules/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,

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ _citrus_BIG5_init_state(_BIG5EncodingInfo * __restrict ei __unused,`
`123`	`123`	`memset(s, 0, sizeof(*s));`
`124`	`124`	`}`
`125`	`125`
	`126`	`+#if 0`
`126`	`127`	`static __inline void`
`127`	`128`	`/ARGSUSED/`
`128`	`129`	`_citrus_BIG5_pack_state(_BIG5EncodingInfo * __restrict ei __unused,`
`@@ -142,6 +143,7 @@ _citrus_BIG5_unpack_state(_BIG5EncodingInfo * __restrict ei __unused,`
`142`	`143`
`143`	`144`	`memcpy((void )s, pspriv, sizeof(s));`
`144`	`145`	`}`
	`146`	`+#endif`
`145`	`147`
`146`	`148`	`static __inline int`
`147`	`149`	`_citrus_BIG5_check(_BIG5EncodingInfo *ei, unsigned int c)`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ _citrus_DECHanyu_init_state(_DECHanyuEncodingInfo * __restrict ei __unused,`
`78`	`78`	`psenc->chlen = 0;`
`79`	`79`	`}`
`80`	`80`
	`81`	`+#if 0`
`81`	`82`	`static __inline void`
`82`	`83`	`/ARGSUSED/`
`83`	`84`	`_citrus_DECHanyu_pack_state(_DECHanyuEncodingInfo * __restrict ei __unused,`
`@@ -96,6 +97,7 @@ _citrus_DECHanyu_unpack_state(_DECHanyuEncodingInfo * __restrict ei __unused,`
`96`	`97`
`97`	`98`	`memcpy((void )psenc, pspriv, sizeof(psenc));`
`98`	`99`	`}`
	`100`	`+#endif`
`99`	`101`
`100`	`102`	`static void`
`101`	`103`	`/ARGSUSED/`
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ _citrus_EUC_init_state(_EUCEncodingInfo ei __unused, _EUCState s)`
`169`	`169`	`memset(s, 0, sizeof(*s));`
`170`	`170`	`}`
`171`	`171`
	`172`	`+#if 0`
`172`	`173`	`static __inline void`
`173`	`174`	`/ARGSUSED/`
`174`	`175`	`_citrus_EUC_pack_state(_EUCEncodingInfo ei __unused, void pspriv,`
`@@ -186,6 +187,7 @@ _citrus_EUC_unpack_state(_EUCEncodingInfo ei __unused, _EUCState s,`
`186`	`187`
`187`	`188`	`memcpy((void )s, pspriv, sizeof(s));`
`188`	`189`	`}`
	`190`	`+#endif`
`189`	`191`
`190`	`192`	`static int`
`191`	`193`	`_citrus_EUC_mbrtowc_priv(_EUCEncodingInfo ei, wchar_t pwc, const char **s,`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@ _citrus_EUCTW_init_state(_EUCTWEncodingInfo * __restrict ei __unused,`
`136`	`136`	`memset(s, 0, sizeof(*s));`
`137`	`137`	`}`
`138`	`138`
	`139`	`+#if 0`
`139`	`140`	`static __inline void`
`140`	`141`	`/ARGSUSED/`
`141`	`142`	`_citrus_EUCTW_pack_state(_EUCTWEncodingInfo * __restrict ei __unused,`
`@@ -153,6 +154,7 @@ _citrus_EUCTW_unpack_state(_EUCTWEncodingInfo * __restrict ei __unused,`
`153`	`154`
`154`	`155`	`memcpy((void )s, pspriv, sizeof(s));`
`155`	`156`	`}`
	`157`	`+#endif`
`156`	`158`
`157`	`159`	`static int`
`158`	`160`	`/ARGSUSED/`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ _citrus_GBK2K_init_state(_GBK2KEncodingInfo * __restrict ei __unused,`
`80`	`80`	`memset(s, 0, sizeof(*s));`
`81`	`81`	`}`
`82`	`82`
	`83`	`+#if 0`
`83`	`84`	`static __inline void`
`84`	`85`	`/ARGSUSED/`
`85`	`86`	`_citrus_GBK2K_pack_state(_GBK2KEncodingInfo * __restrict ei __unused,`
`@@ -97,6 +98,7 @@ _citrus_GBK2K_unpack_state(_GBK2KEncodingInfo * __restrict ei __unused,`
`97`	`98`
`98`	`99`	`memcpy((void )s, pspriv, sizeof(s));`
`99`	`100`	`}`
	`101`	`+#endif`
`100`	`102`
`101`	`103`	`static __inline bool`
`102`	`104`	`_mb_singlebyte(int c)`
Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ _citrus_HZ_init_state(_HZEncodingInfo * __restrict ei,`
`153`	`153`	`psenc->inuse = INIT0(ei);`
`154`	`154`	`}`
`155`	`155`
	`156`	`+#if 0`
`156`	`157`	`static __inline void`
`157`	`158`	`/ARGSUSED/`
`158`	`159`	`_citrus_HZ_pack_state(_HZEncodingInfo * __restrict ei __unused,`
`@@ -170,6 +171,7 @@ _citrus_HZ_unpack_state(_HZEncodingInfo * __restrict ei __unused,`
`170`	`171`
`171`	`172`	`memcpy((void )psenc, pspriv, sizeof(psenc));`
`172`	`173`	`}`
	`174`	`+#endif`
`173`	`175`
`174`	`176`	`static int`
`175`	`177`	`_citrus_HZ_mbrtowc_priv(_HZEncodingInfo * __restrict ei,`
Original file line number	Diff line number	Diff line change
`@@ -444,6 +444,7 @@ _citrus_ISO2022_init_state(_ISO2022EncodingInfo * __restrict ei,`
`444`	`444`	`s->flags \|= _ISO2022STATE_FLAG_INITIALIZED;`
`445`	`445`	`}`
`446`	`446`
	`447`	`+#if 0`
`447`	`448`	`static __inline void`
`448`	`449`	`/ARGSUSED/`
`449`	`450`	`_citrus_ISO2022_pack_state(_ISO2022EncodingInfo * __restrict ei __unused,`
`@@ -461,6 +462,7 @@ _citrus_ISO2022_unpack_state(_ISO2022EncodingInfo * __restrict ei __unused,`
`461`	`462`
`462`	`463`	`memcpy((void )s, pspriv, sizeof(s));`
`463`	`464`	`}`
	`465`	`+#endif`
`464`	`466`
`465`	`467`	`static int`
`466`	`468`	`/ARGSUSED/`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ _citrus_JOHAB_init_state(_JOHABEncodingInfo * __restrict ei __unused,`
`80`	`80`	`psenc->chlen = 0;`
`81`	`81`	`}`
`82`	`82`
	`83`	`+#if 0`
`83`	`84`	`static __inline void`
`84`	`85`	`/ARGSUSED/`
`85`	`86`	`_citrus_JOHAB_pack_state(_JOHABEncodingInfo * __restrict ei __unused,`
`@@ -97,6 +98,7 @@ _citrus_JOHAB_unpack_state(_JOHABEncodingInfo * __restrict ei __unused,`
`97`	`98`
`98`	`99`	`memcpy((void )psenc, pspriv, sizeof(psenc));`
`99`	`100`	`}`
	`101`	`+#endif`
`100`	`102`
`101`	`103`	`static void`
`102`	`104`	`/ARGSUSED/`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,7 @@ _citrus_MSKanji_init_state(_MSKanjiEncodingInfo * __restrict ei __unused,`
`130`	`130`	`s->chlen = 0;`
`131`	`131`	`}`
`132`	`132`
	`133`	`+#if 0`
`133`	`134`	`static __inline void`
`134`	`135`	`/ARGSUSED/`
`135`	`136`	`_citrus_MSKanji_pack_state(_MSKanjiEncodingInfo * __restrict ei __unused,`
`@@ -147,6 +148,7 @@ _citrus_MSKanji_unpack_state(_MSKanjiEncodingInfo * __restrict ei __unused,`
`147`	`148`
`148`	`149`	`memcpy((void )s, pspriv, sizeof(s));`
`149`	`150`	`}`
	`151`	`+#endif`
`150`	`152`
`151`	`153`	`static int`
`152`	`154`	`/ARGSUSED/`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ _citrus_UES_init_state(_UESEncodingInfo * __restrict ei __unused,`
`75`	`75`	`psenc->chlen = 0;`
`76`	`76`	`}`
`77`	`77`
	`78`	`+#if 0`
`78`	`79`	`static __inline void`
`79`	`80`	`/ARGSUSED/`
`80`	`81`	`_citrus_UES_pack_state(_UESEncodingInfo * __restrict ei __unused,`
`@@ -92,6 +93,7 @@ _citrus_UES_unpack_state(_UESEncodingInfo * __restrict ei __unused,`
`92`	`93`
`93`	`94`	`memcpy((void )psenc, pspriv, sizeof(psenc));`
`94`	`95`	`}`
	`96`	`+#endif`
`95`	`97`
`96`	`98`	`static __inline int`
`97`	`99`	`to_int(int ch)`