Date: Sat, 4 Jan 2014 17:27:43 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r260264 - in stable: 10/lib/libiconv_modules/BIG5 10/lib/libiconv_modules/DECHanyu 10/lib/libiconv_modules/EUC 10/lib/libiconv_modules/EUCTW 10/lib/libiconv_modules/GBK2K 10/lib/libicon... Message-ID: <201401041727.s04HRhka015512@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sat Jan 4 17:27:43 2014 New Revision: 260264 URL: http://svnweb.freebsd.org/changeset/base/260264 Log: MFC r260003: In libiconv_modules, surround unused static _citrus_XXX_pack_state() and _citrus_XXX_unpack_state() functions with #if 0, for now. Modified: stable/9/lib/libiconv_modules/BIG5/citrus_big5.c stable/9/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c stable/9/lib/libiconv_modules/EUC/citrus_euc.c stable/9/lib/libiconv_modules/EUCTW/citrus_euctw.c stable/9/lib/libiconv_modules/GBK2K/citrus_gbk2k.c stable/9/lib/libiconv_modules/HZ/citrus_hz.c stable/9/lib/libiconv_modules/ISO2022/citrus_iso2022.c stable/9/lib/libiconv_modules/JOHAB/citrus_johab.c stable/9/lib/libiconv_modules/MSKanji/citrus_mskanji.c stable/9/lib/libiconv_modules/UES/citrus_ues.c stable/9/lib/libiconv_modules/UTF7/citrus_utf7.c stable/9/lib/libiconv_modules/UTF8/citrus_utf8.c stable/9/lib/libiconv_modules/VIQR/citrus_viqr.c stable/9/lib/libiconv_modules/ZW/citrus_zw.c Directory Properties: stable/9/lib/libiconv_modules/ (props changed) Changes in other areas also in this revision: Modified: stable/10/lib/libiconv_modules/BIG5/citrus_big5.c stable/10/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c stable/10/lib/libiconv_modules/EUC/citrus_euc.c stable/10/lib/libiconv_modules/EUCTW/citrus_euctw.c stable/10/lib/libiconv_modules/GBK2K/citrus_gbk2k.c stable/10/lib/libiconv_modules/HZ/citrus_hz.c stable/10/lib/libiconv_modules/ISO2022/citrus_iso2022.c stable/10/lib/libiconv_modules/JOHAB/citrus_johab.c stable/10/lib/libiconv_modules/MSKanji/citrus_mskanji.c stable/10/lib/libiconv_modules/UES/citrus_ues.c stable/10/lib/libiconv_modules/UTF7/citrus_utf7.c stable/10/lib/libiconv_modules/UTF8/citrus_utf8.c stable/10/lib/libiconv_modules/VIQR/citrus_viqr.c stable/10/lib/libiconv_modules/ZW/citrus_zw.c Directory Properties: stable/10/ (props changed) Modified: stable/9/lib/libiconv_modules/BIG5/citrus_big5.c ============================================================================== --- stable/9/lib/libiconv_modules/BIG5/citrus_big5.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/BIG5/citrus_big5.c Sat Jan 4 17:27:43 2014 (r260264) @@ -123,6 +123,7 @@ _citrus_BIG5_init_state(_BIG5EncodingInf 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(_BIG5EncodingI memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static __inline int _citrus_BIG5_check(_BIG5EncodingInfo *ei, unsigned int c) Modified: stable/9/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c ============================================================================== --- stable/9/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c Sat Jan 4 17:27:43 2014 (r260264) @@ -78,6 +78,7 @@ _citrus_DECHanyu_init_state(_DECHanyuEnc 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(_DECHanyuE memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static void /*ARGSUSED*/ Modified: stable/9/lib/libiconv_modules/EUC/citrus_euc.c ============================================================================== --- stable/9/lib/libiconv_modules/EUC/citrus_euc.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/EUC/citrus_euc.c Sat Jan 4 17:27:43 2014 (r260264) @@ -169,6 +169,7 @@ _citrus_EUC_init_state(_EUCEncodingInfo 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(_EUCEncodingInf memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static int _citrus_EUC_mbrtowc_priv(_EUCEncodingInfo *ei, wchar_t *pwc, char **s, Modified: stable/9/lib/libiconv_modules/EUCTW/citrus_euctw.c ============================================================================== --- stable/9/lib/libiconv_modules/EUCTW/citrus_euctw.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/EUCTW/citrus_euctw.c Sat Jan 4 17:27:43 2014 (r260264) @@ -136,6 +136,7 @@ _citrus_EUCTW_init_state(_EUCTWEncodingI 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(_EUCTWEncodin memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static int /*ARGSUSED*/ Modified: stable/9/lib/libiconv_modules/GBK2K/citrus_gbk2k.c ============================================================================== --- stable/9/lib/libiconv_modules/GBK2K/citrus_gbk2k.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/GBK2K/citrus_gbk2k.c Sat Jan 4 17:27:43 2014 (r260264) @@ -80,6 +80,7 @@ _citrus_GBK2K_init_state(_GBK2KEncodingI 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(_GBK2KEncodin memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static __inline bool _mb_singlebyte(int c) Modified: stable/9/lib/libiconv_modules/HZ/citrus_hz.c ============================================================================== --- stable/9/lib/libiconv_modules/HZ/citrus_hz.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/HZ/citrus_hz.c Sat Jan 4 17:27:43 2014 (r260264) @@ -153,6 +153,7 @@ _citrus_HZ_init_state(_HZEncodingInfo * 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 memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static int _citrus_HZ_mbrtowc_priv(_HZEncodingInfo * __restrict ei, Modified: stable/9/lib/libiconv_modules/ISO2022/citrus_iso2022.c ============================================================================== --- stable/9/lib/libiconv_modules/ISO2022/citrus_iso2022.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/ISO2022/citrus_iso2022.c Sat Jan 4 17:27:43 2014 (r260264) @@ -444,6 +444,7 @@ _citrus_ISO2022_init_state(_ISO2022Encod 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(_ISO2022Enc memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static int /*ARGSUSED*/ Modified: stable/9/lib/libiconv_modules/JOHAB/citrus_johab.c ============================================================================== --- stable/9/lib/libiconv_modules/JOHAB/citrus_johab.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/JOHAB/citrus_johab.c Sat Jan 4 17:27:43 2014 (r260264) @@ -80,6 +80,7 @@ _citrus_JOHAB_init_state(_JOHABEncodingI 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(_JOHABEncodin memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static void /*ARGSUSED*/ Modified: stable/9/lib/libiconv_modules/MSKanji/citrus_mskanji.c ============================================================================== --- stable/9/lib/libiconv_modules/MSKanji/citrus_mskanji.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/MSKanji/citrus_mskanji.c Sat Jan 4 17:27:43 2014 (r260264) @@ -130,6 +130,7 @@ _citrus_MSKanji_init_state(_MSKanjiEncod 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(_MSKanjiEnc memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static int /*ARGSUSED*/ Modified: stable/9/lib/libiconv_modules/UES/citrus_ues.c ============================================================================== --- stable/9/lib/libiconv_modules/UES/citrus_ues.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/UES/citrus_ues.c Sat Jan 4 17:27:43 2014 (r260264) @@ -75,6 +75,7 @@ _citrus_UES_init_state(_UESEncodingInfo 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(_UESEncodingInf memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static __inline int to_int(int ch) Modified: stable/9/lib/libiconv_modules/UTF7/citrus_utf7.c ============================================================================== --- stable/9/lib/libiconv_modules/UTF7/citrus_utf7.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/UTF7/citrus_utf7.c Sat Jan 4 17:27:43 2014 (r260264) @@ -87,6 +87,7 @@ _citrus_UTF7_init_state(_UTF7EncodingInf 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(_UTF7EncodingI memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" Modified: stable/9/lib/libiconv_modules/UTF8/citrus_utf8.c ============================================================================== --- stable/9/lib/libiconv_modules/UTF8/citrus_utf8.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/UTF8/citrus_utf8.c Sat Jan 4 17:27:43 2014 (r260264) @@ -156,6 +156,7 @@ _citrus_UTF8_init_state(_UTF8EncodingInf 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(_UTF8EncodingI memcpy((void *)s, pspriv, sizeof(*s)); } +#endif static int _citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo *ei, wchar_t *pwc, char **s, Modified: stable/9/lib/libiconv_modules/VIQR/citrus_viqr.c ============================================================================== --- stable/9/lib/libiconv_modules/VIQR/citrus_viqr.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/VIQR/citrus_viqr.c Sat Jan 4 17:27:43 2014 (r260264) @@ -230,6 +230,7 @@ _citrus_VIQR_init_state(_VIQREncodingInf 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(_VIQREncodingI memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static int _citrus_VIQR_mbrtowc_priv(_VIQREncodingInfo * __restrict ei, Modified: stable/9/lib/libiconv_modules/ZW/citrus_zw.c ============================================================================== --- stable/9/lib/libiconv_modules/ZW/citrus_zw.c Sat Jan 4 17:22:53 2014 (r260263) +++ stable/9/lib/libiconv_modules/ZW/citrus_zw.c Sat Jan 4 17:27:43 2014 (r260264) @@ -85,6 +85,7 @@ _citrus_ZW_init_state(_ZWEncodingInfo * 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 memcpy((void *)psenc, pspriv, sizeof(*psenc)); } +#endif static int _citrus_ZW_mbrtowc_priv(_ZWEncodingInfo * __restrict ei,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401041727.s04HRhka015512>