From 75cd5204dd829d849a6e41380a64cf61d7f406d0 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 1 May 1996 13:55:18 +0000 Subject: Wed May 1 09:10:04 1996 Roland McGrath * time/strftime.c: Use canonical autoconf nugget for time.h+sys/time.h include. Mon Apr 29 02:48:26 1996 Ulrich Drepper * ctype/ctype-info.c: (__ctype_width): New variable. (__ctype_names): Initialize correctly without offset. * locale/C-collate.c, locale/C-ctype.c, locale/C-messages.c, locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c: Change copyright. * locale/C-ctype.c (_nl_C_LC_CTYPE_class32): Correct endianess for initialization value. * locale/lc-ctype.c (current): Add parameter for offset. (__ctype32_b, __ctype_width): Add initialization for these variables. * locale/programs/charmap.c: Finish support for WIDTH information. (new_width): New function. * locale/programs/charset.h (width_rule): new data structure. (charset_t): Add elements for width information. * locale/programs/ld-ctype.c (locale_ctype_t): Add element for width information. (allocate_arrays): Add new argument for charset. (ctype_finish): Make sure all characters named in charset width table are known to name table. (ctype_output): Correct handling of class and map name information and write out width information. (find_idx): Prepare for being called with NULL pointer as TABLE argument. This means only allocate name entry. (allocate_arrays): Correct handling of array element -1. Because EOF == -1 the value of element 127 must *not* be mirrored here. Fill width information from charset tables. * locale/programs/localedef.c (main): Correct loop over all categories after change of order from Thu Mar 28 14:22:51 1996. Add new charset argument to call of `write_all_categories'. * locale/programs/locales.h (ctype_finish, ctype_output): New charset argument. * locale/programs/locfile.c (write_all_categories): Call `ctype_output' with additional argument charset. * posix/getconf.c (vars): Add _POSIX_SYNC_IO, _POSIX_ASYNC_IO, and _POSIX_PRIO_IO definitions. * posix/posix2_lim.h: Add definition of _POSIX2_CHARCLASS_NAME_MAX and CHARCLASS_NAME_MAX. * posix/unistd.h: Document _POSIX_SYNC_IO, _POSIX_ASYNC_IO, and _POSIX_PRIO_IO. * stdlib/grouping.h: Prepare for use in wide string functions. * stdlib/stdlib.h: Correct prototypes for __strto*_internal functions. * stdlib/strtod.c: Extend for use as `wcsto{f,d,ld}'. * stdlib/strtol.c: Extend for use as `wcsto{l,ul,q,uq}'. * string/strcoll.c: Extend for use as `wcscoll'. * string/strxfrm.c: Extend for use as `wcsxfrm'. * sysdeps/generic/confname.h: Add definition of _PC_SYNC_IO, _PC_ASYNC_IO, _PC_PRIO_IO and _SC_CHARCLASS_NAME_MAX. * sysdeps/generic/stpncpy.c: Correct return value. * sysdeps/posix/fpathconf.c: Add handling of _PC_SYNC_IO, _PC_ASYNC_IO, and _PC_PRIO_IO. * sysdeps/posix/sysconf.c: Add handling of _SC_REALTIME_SIGNALS, _SC_PRIORITY_SCHEDULING, _SC_TIMERS, _SC_ASYNCHRONOUS_IO, _SC_PRIORITIZED_IO, _SC_SYNCHRONIZED_IO, _SC_FSYNC, _SC_MAPPED_FILES, _SC_MEMLOCK, _SC_MEMLOCK_RANGE, _SC_MEMORY_PROTECTION, _SC_MESSAGE_PASSING, _SC_SEMAPHORES, _SC_SHARED_MEMORY_OBJECTS, and _SC_CHARCLASS_NAME_MAX. * sysdeps/stub/sysconf.c: Ditto. * sysdeps/unix/sysv/sysv4/sysconf.c: Ditto. * sysdeps/unix/sysv/linux/Dist: Add sys/sysctl.h. * sysdeps/unix/sysv/linux/Makefile [subdir == misc] (sysdep_routines): Add s_sysctl and sysctl. * sysdeps/unix/sysv/linux/sys/mman.h: Add declaration of mremap. * sysdeps/unix/sysv/linux/sys/socket.h: New file. Wrapper around kernel header. * sysdeps/unix/sysv/linux/sys/sysctl.h: New file. Define interface to `sysctl' function. * sysdeps/unix/sysv/linux/syscalls.list: Add mremap and _sysctl. * sysdeps/unix/sysv/linux/sysconf.c: Add handling of _SC_CHARCLASS_NAME_MAX. * sysdeps/unix/sysv/linux/sysctl.c: new file. Implement caller of _sysctl system call. * sysvipc/Makefile (routines): Add ftok. * sysvipc/ftok.c: use variable `proj_id' not `id'. Patch by David Mosberger-Tang. * wcsmbs/Makefile (routines): Add wcpcpy, wcpncpy, wcstol, wcstoul, wcstoq, wcstouq, wcstod, wcstold, wcstof, wcscoll, wcsxfrm, wcwidth, and wcswidth. * wcsmbs/wchar.h: Add declarations for wcpcpy, wcpncpy, wcstol, wcstoul, wcstoq, wcstouq, wcstod, wcstold, wcstof, wcscoll, wcsxfrm, wcwidth, and wcswidth. Declare internal interfaces for wcsto* functions. [OPTIMIZE]: Define inline functions for wcsto* functions to call internal interface functions. * wcsmbs/wcpcpy.c, wcsmbs/wcpncpy.c: New files. Implement non- standard function equivalent to stpcpy/stpncpy. * wcsmbs/wcscoll.c: Implement `wcscoll' function by using `strcoll' implementation. * wcsmbs/wcscpy.c, wcsmbs/wcsncpy.c: Use wint_t instead of wchar_t. * wcsmbs/wcstod.c: Implement `wcstod' function by using `strtod' implementation. * wcsmbs/wcstof.c: Same for `wcstof'. * wcsmbs/wcstold.c: Same for `strtold'. * wcsmbs/wcstol.c: Implement `wcstol' function by using `strtol' implementation. * wcsmbs/wcstoq.c: Same for `wcstoq'. * wcsmbs/wcstoul.c: Same for `wcstoul'. * wcsmbs/wcstouq.c: Same for `wcstouq'. * wcsmbs/wcswidth.c: Implement `wcswidth' function from X/Open CAE. * wcsmbs/wcwidth.c: Ditto for `wcwidth'. * wcsmbs/wcwidth.h: Common function for definitions of above two functions. * wcsmbs/wcsxfrm.c: Implement `wcsxfrm function by using `strxfrm implementation. * wctype/wctype.c: Remove case for `wctype_t' being 16 bit type. * wctype/wctype.h (wint_t): Protect against multiple definition. (wctype_t): Always define as `unsigned long int'. * wctype.h: New file. Wrapper around wctype/wctype.h. * hurd/hurdstartup.c (_hurd_split_args): Function removed. (_hurd_startup): Use argz functions. * hurd/hurdexec.c: Use argz functions. --- locale/programs/locales.h | 129 +++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 64 deletions(-) (limited to 'locale/programs/locales.h') diff --git a/locale/programs/locales.h b/locale/programs/locales.h index 3c7676b765..a992642805 100644 --- a/locale/programs/locales.h +++ b/locale/programs/locales.h @@ -79,129 +79,130 @@ charclass_to_bit (enum token_t tok) /* Remember name of newly created charclass. */ void ctype_startup (struct linereader *lr, struct localedef_t *locale, - struct charset_t *__charset); -void ctype_finish (struct localedef_t *__locale, struct charset_t *__charset); + struct charset_t *charset); +void ctype_finish (struct localedef_t *locale, struct charset_t *charset); -void ctype_output (struct localedef_t *locale, const char *output_path); +void ctype_output (struct localedef_t *locale, struct charset_t *charset, + const char *output_path); int ctype_is_charclass (struct linereader *lr, struct localedef_t *locale, - const char *__name); + const char *name); void ctype_class_new (struct linereader *lr, struct localedef_t *locale, - enum token_t __tok, struct token *__code, - struct charset_t *__charset); + enum token_t tok, struct token *code, + struct charset_t *charset); void ctype_class_start (struct linereader *lr, struct localedef_t *locale, - enum token_t __tok, const char *__name, - struct charset_t *__charset); + enum token_t tok, const char *name, + struct charset_t *charset); void ctype_class_from (struct linereader *lr, struct localedef_t *locale, - struct token *__code, struct charset_t *__charset); + struct token *code, struct charset_t *charset); void ctype_class_to (struct linereader *lr, struct localedef_t *locale, - struct token *__code, struct charset_t *__charset); + struct token *code, struct charset_t *charset); void ctype_class_end (struct linereader *lr, struct localedef_t *locale); int ctype_is_charmap (struct linereader *lr, struct localedef_t *locale, - const char *__name); + const char *name); void ctype_map_new (struct linereader *lr, struct localedef_t *locale, - enum token_t __tok, struct token *__code, - struct charset_t *__charset); + enum token_t tok, struct token *code, + struct charset_t *charset); void ctype_map_start (struct linereader *lr, struct localedef_t *locale, - enum token_t __tok, const char *__name, - struct charset_t *__charset); + enum token_t tok, const char *name, + struct charset_t *charset); void ctype_map_from (struct linereader *lr, struct localedef_t *locale, - struct token *__code, struct charset_t *__charset); + struct token *code, struct charset_t *charset); void ctype_map_to (struct linereader *lr, struct localedef_t *locale, - struct token *__code, struct charset_t *__charset); + struct token *code, struct charset_t *charset); void ctype_map_end (struct linereader *lr, struct localedef_t *locale); /* Handle LC_COLLATE category. */ -void collate_startup (struct linereader *__lr, struct localedef_t *__locale, - struct charset_t *__charset); +void collate_startup (struct linereader *lr, struct localedef_t *locale, + struct charset_t *charset); -void collate_finish (struct localedef_t *__locale, - struct charset_t *__charset); +void collate_finish (struct localedef_t *locale, + struct charset_t *charset); void collate_output (struct localedef_t *locale, const char *output_path); -void collate_element_to (struct linereader *__lr, struct localedef_t *__locale, - struct token *__code, struct charset_t *__charset); -void collate_element_from (struct linereader *__lr, - struct localedef_t *__locale, struct token *__code, - struct charset_t *__charset); -void collate_symbol (struct linereader *__lr, struct localedef_t *__locale, - struct token *__code, struct charset_t *__charset); -void collate_new_order (struct linereader *__lr, struct localedef_t *__locale, - enum coll_sort_rule __sort_rule); -void collate_build_arrays (struct linereader *__lr, - struct localedef_t *__locale); -int collate_order_elem (struct linereader *__lr, struct localedef_t *__locale, - struct token *__code, struct charset_t *__charset); -int collate_weight_bsymbol (struct linereader *__lr, - struct localedef_t *__locale, - struct token *__code, struct charset_t *__charset); -int collate_next_weight (struct linereader *__lr, - struct localedef_t *__locale); -int collate_simple_weight (struct linereader *__lr, - struct localedef_t *__locale, - struct token *__code, struct charset_t *__charset); -void collate_end_weight (struct linereader *__lr, - struct localedef_t *__locale); +void collate_element_to (struct linereader *lr, struct localedef_t *locale, + struct token *code, struct charset_t *charset); +void collate_element_from (struct linereader *lr, + struct localedef_t *locale, struct token *code, + struct charset_t *charset); +void collate_symbol (struct linereader *lr, struct localedef_t *locale, + struct token *code, struct charset_t *charset); +void collate_new_order (struct linereader *lr, struct localedef_t *locale, + enum coll_sort_rule sort_rule); +void collate_build_arrays (struct linereader *lr, + struct localedef_t *locale); +int collate_order_elem (struct linereader *lr, struct localedef_t *locale, + struct token *code, struct charset_t *charset); +int collate_weight_bsymbol (struct linereader *lr, + struct localedef_t *locale, + struct token *code, struct charset_t *charset); +int collate_next_weight (struct linereader *lr, + struct localedef_t *locale); +int collate_simple_weight (struct linereader *lr, + struct localedef_t *locale, + struct token *code, struct charset_t *charset); +void collate_end_weight (struct linereader *lr, + struct localedef_t *locale); /* Handle LC_MONETARY category. */ -void monetary_startup (struct linereader *__lr, struct localedef_t *__locale, - struct charset_t *__charset); +void monetary_startup (struct linereader *lr, struct localedef_t *locale, + struct charset_t *charset); -void monetary_finish (struct localedef_t *__locale); +void monetary_finish (struct localedef_t *locale); void monetary_output (struct localedef_t *locale, const char *output_path); void monetary_add (struct linereader *lr, struct localedef_t *locale, - enum token_t __tok, struct token *__code, - struct charset_t *__charset); + enum token_t tok, struct token *code, + struct charset_t *charset); /* Handle LC_NUMERIC category. */ -void numeric_startup (struct linereader *__lr, struct localedef_t *__locale, - struct charset_t *__charset); +void numeric_startup (struct linereader *lr, struct localedef_t *locale, + struct charset_t *charset); -void numeric_finish (struct localedef_t *__locale); +void numeric_finish (struct localedef_t *locale); void numeric_output (struct localedef_t *locale, const char *output_path); void numeric_add (struct linereader *lr, struct localedef_t *locale, - enum token_t __tok, struct token *__code, - struct charset_t *__charset); + enum token_t tok, struct token *code, + struct charset_t *charset); /* Handle LC_TIME category. */ -void time_startup (struct linereader *__lr, struct localedef_t *__locale, - struct charset_t *__charset); +void time_startup (struct linereader *lr, struct localedef_t *locale, + struct charset_t *charset); -void time_finish (struct localedef_t *__locale); +void time_finish (struct localedef_t *locale); void time_output (struct localedef_t *locale, const char *output_path); void time_add (struct linereader *lr, struct localedef_t *locale, - enum token_t __tok, struct token *__code, - struct charset_t *__charset); + enum token_t tok, struct token *code, + struct charset_t *charset); /* Handle LC_MESSAGES category. */ -void messages_startup (struct linereader *__lr, struct localedef_t *__locale, - struct charset_t *__charset); +void messages_startup (struct linereader *lr, struct localedef_t *locale, + struct charset_t *charset); -void messages_finish (struct localedef_t *__locale); +void messages_finish (struct localedef_t *locale); void messages_output (struct localedef_t *locale, const char *output_path); void messages_add (struct linereader *lr, struct localedef_t *locale, - enum token_t __tok, struct token *__code, - struct charset_t *__charset); + enum token_t tok, struct token *code, + struct charset_t *charset); #endif /* locales.h */ -- cgit v1.2.3