From 22f749d90e97e5b3ffa074fbef5cdaf4ee857388 Mon Sep 17 00:00:00 2001 From: dim Date: Tue, 14 Feb 2012 21:48:46 +0000 Subject: Revert r231673 and r231682 for now, until we can run a full make universe with them. Sorry for the breakage. Pointy hat to: me and brooks --- include/xlocale/Makefile | 8 -- include/xlocale/_ctype.h | 182 -------------------------------------------- include/xlocale/_inttypes.h | 44 ----------- include/xlocale/_langinfo.h | 42 ---------- include/xlocale/_locale.h | 56 -------------- include/xlocale/_monetary.h | 45 ----------- include/xlocale/_stdio.h | 64 ---------------- include/xlocale/_stdlib.h | 59 -------------- include/xlocale/_string.h | 61 --------------- include/xlocale/_time.h | 58 -------------- include/xlocale/_wchar.h | 133 -------------------------------- 11 files changed, 752 deletions(-) delete mode 100644 include/xlocale/Makefile delete mode 100644 include/xlocale/_ctype.h delete mode 100644 include/xlocale/_inttypes.h delete mode 100644 include/xlocale/_langinfo.h delete mode 100644 include/xlocale/_locale.h delete mode 100644 include/xlocale/_monetary.h delete mode 100644 include/xlocale/_stdio.h delete mode 100644 include/xlocale/_stdlib.h delete mode 100644 include/xlocale/_string.h delete mode 100644 include/xlocale/_time.h delete mode 100644 include/xlocale/_wchar.h (limited to 'include/xlocale') diff --git a/include/xlocale/Makefile b/include/xlocale/Makefile deleted file mode 100644 index e45ddca..0000000 --- a/include/xlocale/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -NO_OBJ= -INCS= _ctype.h _inttypes.h _langinfo.h _locale.h _monetary.h _stdio.h\ - _stdlib.h _string.h _time.h _wchar.h -INCSDIR=${INCLUDEDIR}/xlocale - -.include diff --git a/include/xlocale/_ctype.h b/include/xlocale/_ctype.h deleted file mode 100644 index d8d68b9..0000000 --- a/include/xlocale/_ctype.h +++ /dev/null @@ -1,182 +0,0 @@ -/*- - * Copyright (c) 2011 The FreeBSD Foundation - * All rights reserved. - * - * This software was developed by David Chisnall under sponsorship from - * the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - - -#if (defined(_XLOCALE_WCTYPES) && !defined(_XLOCALE_WCTYPE_H)) || \ - (!defined(_XLOCALE_WCTYPES) && !defined(_XLOCALE_CTYPE_H)) - -#ifdef _XLOCALE_WCTYPES -#define _XLOCALE_WCTYPE_H -#else -#define _XLOCALE_CTYPE_H -#endif - -#ifndef _LOCALE_T_DEFINED -#define _LOCALE_T_DEFINED -typedef struct _xlocale *locale_t; -#endif - -#ifndef _XLOCALE_CTYPE_H_ -unsigned long ___runetype_l(__ct_rune_t, locale_t) __pure; -__ct_rune_t ___tolower_l(__ct_rune_t, locale_t) __pure; -__ct_rune_t ___toupper_l(__ct_rune_t, locale_t) __pure; -_RuneLocale *__runes_for_locale(locale_t, int*); -#endif - -#ifndef _XLOCALE_INLINE -#if __GNUC__ && !__GNUC_STDC_INLINE__ -/* GNU89 inline has nonstandard semantics. */ -#define _XLOCALE_INLINE extern inline -#else -/* Hack to work around people who define inline away */ -#ifdef inline -#define _XLOCALE_INLINE __inline static -#else -/* Define with C++ / C99 compatible semantics */ -#define _XLOCALE_INLINE inline -#endif -#endif -#endif /* _XLOCALE_INLINE */ - -#ifdef _XLOCALE_WCTYPES -static __inline int -__maskrune_l(__ct_rune_t _c, unsigned long _f, locale_t locale) -{ - int mb_sb_limit; - _RuneLocale *runes = __runes_for_locale(locale, &mb_sb_limit); - return (_c < 0 || _c >= _CACHED_RUNES) ? ___runetype_l(_c, locale) : - runes->__runetype[_c] & _f; -} - -static __inline int -__istype_l(__ct_rune_t _c, unsigned long _f, locale_t locale) -{ - return (!!__maskrune_l(_c, _f, locale)); -} - -#define XLOCALE_ISCTYPE(fname, cat) \ - _XLOCALE_INLINE int isw##fname##_l(int c, locale_t l)\ - { return __istype_l(c, cat, l); } -#else -static __inline int -__sbmaskrune_l(__ct_rune_t _c, unsigned long _f, locale_t locale) -{ - int mb_sb_limit; - _RuneLocale *runes = __runes_for_locale(locale, &mb_sb_limit); - return (_c < 0 || _c >= mb_sb_limit) ? 0 : - runes->__runetype[_c] & _f; -} - -static __inline int -__sbistype_l(__ct_rune_t _c, unsigned long _f, locale_t locale) -{ - return (!!__sbmaskrune_l(_c, _f, locale)); -} - -#define XLOCALE_ISCTYPE(fname, cat) \ - _XLOCALE_INLINE int is##fname##_l(int c, locale_t l)\ - { return __sbistype_l(c, cat, l); } -#endif - -XLOCALE_ISCTYPE(alnum, _CTYPE_A|_CTYPE_D) -XLOCALE_ISCTYPE(alpha, _CTYPE_A) -XLOCALE_ISCTYPE(blank, _CTYPE_B) -XLOCALE_ISCTYPE(cntrl, _CTYPE_C) -XLOCALE_ISCTYPE(digit, _CTYPE_D) -XLOCALE_ISCTYPE(graph, _CTYPE_G) -XLOCALE_ISCTYPE(hexnumber, _CTYPE_X) -XLOCALE_ISCTYPE(ideogram, _CTYPE_I) -XLOCALE_ISCTYPE(lower, _CTYPE_L) -XLOCALE_ISCTYPE(number, _CTYPE_D) -XLOCALE_ISCTYPE(phonogram, _CTYPE_Q) -XLOCALE_ISCTYPE(print, _CTYPE_R) -XLOCALE_ISCTYPE(punct, _CTYPE_P) -XLOCALE_ISCTYPE(rune, 0xFFFFFF00L) -XLOCALE_ISCTYPE(space, _CTYPE_S) -XLOCALE_ISCTYPE(special, _CTYPE_T) -XLOCALE_ISCTYPE(upper, _CTYPE_U) -XLOCALE_ISCTYPE(xdigit, _CTYPE_X) -#undef XLOCALE_ISCTYPE - -#ifdef _XLOCALE_WCTYPES -_XLOCALE_INLINE int towlower_l(int c, locale_t locale) -{ - int mb_sb_limit; - _RuneLocale *runes = __runes_for_locale(locale, &mb_sb_limit); - return (c < 0 || c >= _CACHED_RUNES) ? ___tolower_l(c, locale) : - runes->__maplower[c]; -} -_XLOCALE_INLINE int towupper_l(int c, locale_t locale) -{ - int mb_sb_limit; - _RuneLocale *runes = __runes_for_locale(locale, &mb_sb_limit); - return (c < 0 || c >= _CACHED_RUNES) ? ___toupper_l(c, locale) : - runes->__mapupper[c]; -} -_XLOCALE_INLINE int -__wcwidth_l(__ct_rune_t _c, locale_t locale) -{ - unsigned int _x; - - if (_c == 0) - return (0); - _x = (unsigned int)__maskrune_l(_c, _CTYPE_SWM|_CTYPE_R, locale); - if ((_x & _CTYPE_SWM) != 0) - return ((_x & _CTYPE_SWM) >> _CTYPE_SWS); - return ((_x & _CTYPE_R) != 0 ? 1 : -1); -} -int iswctype_l(wint_t wc, wctype_t charclass, locale_t locale); -wctype_t wctype_l(const char *property, locale_t locale); -wint_t towctrans_l(wint_t wc, wctrans_t desc, locale_t locale); -wint_t nextwctype_l(wint_t wc, wctype_t wct, locale_t locale); -wctrans_t wctrans_l(const char *charclass, locale_t locale); -#undef _XLOCALE_WCTYPES -#else -_XLOCALE_INLINE int digittoint_l(int c, locale_t locale) -{ return __sbmaskrune_l((c), 0xFF, locale); } - -_XLOCALE_INLINE int tolower_l(int c, locale_t locale) -{ - int mb_sb_limit; - _RuneLocale *runes = __runes_for_locale(locale, &mb_sb_limit); - return (c < 0 || c >= mb_sb_limit) ? c : - runes->__maplower[c]; -} -_XLOCALE_INLINE int toupper_l(int c, locale_t locale) -{ - int mb_sb_limit; - _RuneLocale *runes = __runes_for_locale(locale, &mb_sb_limit); - return (c < 0 || c >= mb_sb_limit) ? c : - runes->__mapupper[c]; -} -#endif -#endif /* (defined(_XLOCALE_WCTYPES) && !defined(_XLOCALE_WCTYPE_H)) || \ - (!defined(_XLOCALE_WCTYPES) && !defined(_XLOCALE_CTYPE_H)) */ diff --git a/include/xlocale/_inttypes.h b/include/xlocale/_inttypes.h deleted file mode 100644 index 58e434e..0000000 --- a/include/xlocale/_inttypes.h +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * Copyright (c) 2011, 2012 The FreeBSD Foundation - * All rights reserved. - * - * This software was developed by David Chisnall under sponsorship from - * the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - - -/* - * Extended locale versions of the locale-aware functions from inttypes.h. - * Include before to expose these. - */ -intmax_t strtoimax_l(const char * __restrict, char ** __restrict, - int, locale_t); -uintmax_t strtoumax_l(const char * __restrict, char ** __restrict, int, - locale_t); -intmax_t wcstoimax_l(const wchar_t * __restrict, wchar_t ** __restrict, - int , locale_t); -uintmax_t wcstoumax_l(const wchar_t * __restrict, wchar_t ** __restrict, - int, locale_t); diff --git a/include/xlocale/_langinfo.h b/include/xlocale/_langinfo.h deleted file mode 100644 index e4f8c50..0000000 --- a/include/xlocale/_langinfo.h +++ /dev/null @@ -1,42 +0,0 @@ -/*- - * Copyright (c) 2011, 2012 The FreeBSD Foundation - * All rights reserved. - * - * This software was developed by David Chisnall under sponsorship from - * the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _XLOCALE_LANGINFO_H -#define _XLOCALE_LANGINFO_H - -#ifndef _LOCALE_T_DEFINED -#define _LOCALE_T_DEFINED -typedef struct _xlocale *locale_t; -#endif - -char *nl_langinfo_l(nl_item, locale_t); - -#endif /* _XLOCALE_LANGINFO_H */ diff --git a/include/xlocale/_locale.h b/include/xlocale/_locale.h deleted file mode 100644 index f8aafb8..0000000 --- a/include/xlocale/_locale.h +++ /dev/null @@ -1,56 +0,0 @@ -/*- - * Copyright (c) 2011, 2012 The FreeBSD Foundation - * All rights reserved. - * - * This software was developed by David Chisnall under sponsorship from - * the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _XLOCALE_LOCALE_H -#define _XLOCALE_LOCALE_H - -#define LC_COLLATE_MASK (1<<0) -#define LC_CTYPE_MASK (1<<1) -#define LC_MESSAGES_MASK (1<<2) -#define LC_MONETARY_MASK (1<<3) -#define LC_NUMERIC_MASK (1<<4) -#define LC_TIME_MASK (1<<5) -#define LC_ALL_MASK (LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MESSAGES_MASK | \ - LC_MONETARY_MASK | LC_NUMERIC_MASK | LC_TIME_MASK) -#define LC_GLOBAL_LOCALE ((locale_t)-1) - -#ifndef _LOCALE_T_DEFINED -#define _LOCALE_T_DEFINED -typedef struct _xlocale *locale_t; -#endif - -locale_t duplocale(locale_t base); -int freelocale(locale_t loc); -locale_t newlocale(int mask, const char *locale, locale_t base); -const char *querylocale(int mask, locale_t loc); -locale_t uselocale(locale_t loc); - -#endif /* _XLOCALE_LOCALE_H */ diff --git a/include/xlocale/_monetary.h b/include/xlocale/_monetary.h deleted file mode 100644 index 3481278..0000000 --- a/include/xlocale/_monetary.h +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * Copyright (c) 2011, 2012 The FreeBSD Foundation - * All rights reserved. - * - * This software was developed by David Chisnall under sponsorship from - * the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _LOCALE_T_DEFINED -#define _LOCALE_T_DEFINED -typedef struct _xlocale *locale_t; -#endif - -#if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_) -#ifndef _XLOCALE_MONETARY_H -#define _XLOCALE_MONETARY_H - -ssize_t strfmon_l(char *, size_t, locale_t, const char *, ...) - __strfmonlike(4, 5); - -#endif /* _XLOCALE_MONETARY_H */ -#endif /* __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_) */ diff --git a/include/xlocale/_stdio.h b/include/xlocale/_stdio.h deleted file mode 100644 index 0aebdcf..0000000 --- a/include/xlocale/_stdio.h +++ /dev/null @@ -1,64 +0,0 @@ -/*- - * Copyright (c) 2011, 2012 The FreeBSD Foundation - * All rights reserved. - * - * This software was developed by David Chisnall under sponsorship from - * the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -int asprintf_l(char **, locale_t, const char *, ...) __printflike(3, 4); -int dprintf_l(int, locale_t, const char * __restrict, ...) - __printflike(3, 4); -int fprintf_l(FILE * __restrict, locale_t, const char * __restrict, ...) - __printflike(3, 4); -int fscanf_l(FILE * __restrict, locale_t, const char * __restrict, ...) - __scanflike(3, 4); -int printf_l(locale_t, const char * __restrict, ...) __printflike(2, 3); -int scanf_l(locale_t, const char * __restrict, ...) __scanflike(2, 3); -int snprintf_l(char * __restrict, size_t, locale_t, - const char * __restrict, ...) __printflike(4, 5); -int sprintf_l(char * __restrict, locale_t, const char * __restrict, ...) - __printflike(3, 4); -int sscanf_l(const char * __restrict, locale_t, const char * __restrict, - ...) __scanflike(3, 4); -int vfprintf_l(FILE * __restrict, locale_t, const char * __restrict, - __va_list) __printflike(3, 0); -int vprintf_l(locale_t, const char * __restrict, __va_list) - __printflike(2, 0); -int vsprintf_l(char * __restrict, locale_t, const char * __restrict, - __va_list) __printflike(3, 0); -int vfscanf_l(FILE * __restrict, locale_t, const char * __restrict, - __va_list) __scanflike(3, 0); -int vscanf_l(locale_t, const char * __restrict, __va_list) - __scanflike(2, 0); -int vsnprintf_l(char * __restrict, size_t, locale_t, - const char * __restrict, __va_list) __printflike(4, 0); -int vsscanf_l(const char * __restrict, locale_t, const char * __restrict, - __va_list) __scanflike(3, 0); -int vdprintf_l(int, locale_t, const char * __restrict, __va_list) - __printflike(3, 0); -int vasprintf_l(char **, locale_t, const char *, __va_list) - __printflike(3, 0); diff --git a/include/xlocale/_stdlib.h b/include/xlocale/_stdlib.h deleted file mode 100644 index 35a2580..0000000 --- a/include/xlocale/_stdlib.h +++ /dev/null @@ -1,59 +0,0 @@ -/*- - * Copyright (c) 2011, 2012 The FreeBSD Foundation - * All rights reserved. - * - * This software was developed by David Chisnall under sponsorship from - * the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -/* - * Extended locale versions of the locale-aware functions from stdlib.h. - * - * Include before to expose these. - */ -double atof_l(const char *, locale_t); -int atoi_l(const char *, locale_t); -long atol_l(const char *, locale_t); -long long atoll_l(const char *, locale_t); -int mblen_l(const char *, size_t, locale_t); -size_t mbstowcs_l(wchar_t * __restrict, - const char * __restrict, size_t, locale_t); -int mbtowc_l(wchar_t * __restrict, - const char * __restrict, size_t, locale_t); -double strtod_l(const char *, char **, locale_t); -float strtof_l(const char *, char **, locale_t); -long strtol_l(const char *, char **, int, locale_t); -long double strtold_l(const char *, char **, locale_t); -long long strtoll_l(const char *, char **, int, locale_t); -unsigned long strtoul_l(const char *, char **, int, locale_t); -unsigned long long strtoull_l(const char *, char **, int, locale_t); -size_t wcstombs_l(char * __restrict, - const wchar_t * __restrict, size_t, locale_t); -int wctomb_l(char *, wchar_t, locale_t); - -int ___mb_cur_max_l(locale_t); -#define MB_CUR_MAX_L(x) (___mb_cur_max_l(x)) - diff --git a/include/xlocale/_string.h b/include/xlocale/_string.h deleted file mode 100644 index 2627280..0000000 --- a/include/xlocale/_string.h +++ /dev/null @@ -1,61 +0,0 @@ -/*- - * Copyright (c) 2011, 2012 The FreeBSD Foundation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _LOCALE_T_DEFINED -#define _LOCALE_T_DEFINED -typedef struct _xlocale *locale_t; -#endif - -/* - * This file is included from both string.h and xlocale.h. We need to expose - * the declarations unconditionally if we are included from xlocale.h, but only - * if we are in POSIX2008 mode if included from string.h. - */ - -#ifndef _XLOCALE_STRING1_H -#define _XLOCALE_STRING1_H - -/* - * POSIX2008 functions - */ -int strcoll_l(const char *, const char *, locale_t); -size_t strxfrm_l(char *, const char *, size_t, locale_t); -#endif /* _XLOCALE_STRING1_H */ - -/* - * xlocale extensions - */ -#ifdef _XLOCALE_H_ -#ifndef _XLOCALE_STRING2_H -#define _XLOCALE_STRING2_H -int strcasecmp_l(const char *, const char *, locale_t); -char *strcasestr_l(const char *, const char *, locale_t); -int strncasecmp_l(const char *, const char *, size_t, locale_t); - -#endif /* _XLOCALE_STRING2_H */ -#endif /* _XLOCALE_H_ */ diff --git a/include/xlocale/_time.h b/include/xlocale/_time.h deleted file mode 100644 index 4493fdd..0000000 --- a/include/xlocale/_time.h +++ /dev/null @@ -1,58 +0,0 @@ -/*- - * Copyright (c) 2011, 2012 The FreeBSD Foundation - * All rights reserved. - * - * This software was developed by David Chisnall under sponsorship from - * the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _LOCALE_T_DEFINED -#define _LOCALE_T_DEFINED -typedef struct _xlocale *locale_t; -#endif - -/* - * This file is included from both locale.h and xlocale.h. We need to expose - * the declarations unconditionally if we are included from xlocale.h, but only - * if we are in POSIX2008 mode if included from locale.h. - */ -#ifndef _XLOCALE_LOCALE1_H -#define _XLOCALE_LOCALE1_H - -size_t strftime_l(char * __restrict, size_t, const char * __restrict, - const struct tm * __restrict, locale_t) __strftimelike(3, 0); - -#endif /* _XLOCALE_LOCALE1_H */ - -#ifdef _XLOCALE_H_ -#ifndef _XLOCALE_LOCALE2_H -#define _XLOCALE_LOCALE2_H - -char *strptime_l(const char * __restrict, const char * __restrict, - struct tm * __restrict, locale_t); - -#endif /* _XLOCALE_LOCALE2_H */ -#endif /* _XLOCALE_H_ */ diff --git a/include/xlocale/_wchar.h b/include/xlocale/_wchar.h deleted file mode 100644 index 6b02d05..0000000 --- a/include/xlocale/_wchar.h +++ /dev/null @@ -1,133 +0,0 @@ -/*- - * Copyright (c) 2011, 2012 The FreeBSD Foundation - * All rights reserved. - * - * This software was developed by David Chisnall under sponsorship from - * the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _LOCALE_T_DEFINED -#define _LOCALE_T_DEFINED -typedef struct _xlocale *locale_t; -#endif - -#ifndef _XLOCALE_WCHAR1_H -#define _XLOCALE_WCHAR1_H -int wcscasecmp_l(const wchar_t *, const wchar_t *, - locale_t); -int wcsncasecmp_l(const wchar_t *, const wchar_t *, size_t, - locale_t); -int wcscoll_l(const wchar_t *, const wchar_t *, locale_t); -size_t wcsxfrm_l(wchar_t * __restrict, - const wchar_t * __restrict, size_t, locale_t); - -#endif /* _XLOCALE_WCHAR1_H */ - -/* - * Only declare the non-POSIX functions if we're included from xlocale.h. - */ - -#ifdef _XLOCALE_H_ -#ifndef _XLOCALE_WCHAR2_H -#define _XLOCALE_WCHAR2_H - -wint_t btowc_l(int, locale_t); -wint_t fgetwc_l(FILE *, locale_t); -wchar_t *fgetws_l(wchar_t * __restrict, int, FILE * __restrict, - locale_t); -wint_t fputwc_l(wchar_t, FILE *, locale_t); -int fputws_l(const wchar_t * __restrict, FILE * __restrict, - locale_t); -int fwprintf_l(FILE * __restrict, locale_t, - const wchar_t * __restrict, ...); -int fwscanf_l(FILE * __restrict, locale_t, - const wchar_t * __restrict, ...); -wint_t getwc_l(FILE *, locale_t); -wint_t getwchar_l(locale_t); -size_t mbrlen_l(const char * __restrict, size_t, - mbstate_t * __restrict, locale_t); -size_t mbrtowc_l(wchar_t * __restrict, - const char * __restrict, size_t, - mbstate_t * __restrict, locale_t); -int mbsinit_l(const mbstate_t *, locale_t); -size_t mbsrtowcs_l(wchar_t * __restrict, - const char ** __restrict, size_t, - mbstate_t * __restrict, locale_t); -wint_t putwc_l(wchar_t, FILE *, locale_t); -wint_t putwchar_l(wchar_t, locale_t); -int swprintf_l(wchar_t * __restrict, size_t n, locale_t, - const wchar_t * __restrict, ...); -int swscanf_l(const wchar_t * __restrict, locale_t, - const wchar_t * __restrict, ...); -wint_t ungetwc_l(wint_t, FILE *, locale_t); -int vfwprintf_l(FILE * __restrict, locale_t, - const wchar_t * __restrict, __va_list); -int vswprintf_l(wchar_t * __restrict, size_t n, locale_t, - const wchar_t * __restrict, __va_list); -int vwprintf_l(locale_t, const wchar_t * __restrict, - __va_list); -size_t wcrtomb_l(char * __restrict, wchar_t, - mbstate_t * __restrict, locale_t); -size_t wcsftime_l(wchar_t * __restrict, size_t, - const wchar_t * __restrict, - const struct tm * __restrict, locale_t); -size_t wcsrtombs_l(char * __restrict, - const wchar_t ** __restrict, size_t, - mbstate_t * __restrict, locale_t); -double wcstod_l(const wchar_t * __restrict, - wchar_t ** __restrict, locale_t); -long wcstol_l(const wchar_t * __restrict, - wchar_t ** __restrict, int, locale_t); -unsigned long wcstoul_l(const wchar_t * __restrict, - wchar_t ** __restrict, int, locale_t); -int wcswidth_l(const wchar_t *, size_t, locale_t); -int wctob_l(wint_t, locale_t); -int wcwidth_l(wchar_t, locale_t); -int wprintf_l(locale_t, const wchar_t * __restrict, ...); -int wscanf_l(locale_t, const wchar_t * __restrict, ...); -int vfwscanf_l(FILE * __restrict, locale_t, - const wchar_t * __restrict, __va_list); -int vswscanf_l(const wchar_t * __restrict, locale_t, - const wchar_t *__restrict, __va_list); -int vwscanf_l(locale_t, const wchar_t * __restrict, - __va_list); -float wcstof_l(const wchar_t * __restrict, - wchar_t ** __restrict, locale_t); -long double wcstold_l(const wchar_t * __restrict, - wchar_t ** __restrict, locale_t); -long long wcstoll_l(const wchar_t * __restrict, - wchar_t ** __restrict, int, locale_t); -unsigned long long wcstoull_l(const wchar_t * __restrict, - wchar_t ** __restrict, int, locale_t); -size_t mbsnrtowcs_l(wchar_t * __restrict, - const char ** __restrict, size_t, size_t, - mbstate_t * __restrict, locale_t); -size_t wcsnrtombs_l(char * __restrict, - const wchar_t ** __restrict, size_t, size_t, - mbstate_t * __restrict, locale_t); - -#endif /* _XLOCALE_WCHAR_H */ -#endif /* _XLOCALE_H_ */ -- cgit v1.1