diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-12-25 23:41:39 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-12-25 23:41:39 +0000 |
| commit | 450bf66ef223ad83e7032920652445817865770b (patch) | |
| tree | 1bfd6848a2453f4ad2c9cdca8e4e4c817e995798 /wcsmbs | |
| parent | ce40141c6b68a40687f460450e1d07a0a78e1559 (diff) | |
| download | glibc-450bf66ef223ad83e7032920652445817865770b.tar.gz glibc-450bf66ef223ad83e7032920652445817865770b.tar.xz glibc-450bf66ef223ad83e7032920652445817865770b.zip | |
Update.
1999-12-25 Ulrich Drepper <drepper@cygnus.com> * locale/C-collate.c (_nl_C_LC_COLLATE): Add one more entry for the indirect table. * locale/langinfo.h: Likewise. * locale/categories.def: Likewise. Remove reference to postload functions. * locale/lc-collate.c (_nl_postload_collate): Removed. Also remove __collate_tablemb, __collate_weightmb, and __collate_extramb. * locale/localeinfo.h: Remove declaration for removed variables above. Remove prototype for _nl_get_era_entry. * locale/weight.h: Complete rewrite for new collate implementation. * locale/programs/ld-collate.c: Many changes to make output file usable in strxfrm/strcoll. * string/strxfrm.c: Complete rewrite for new collate implementation. * wcsmbs/wcsxfrm.c: Don't use strxfrm.c, implement dummy implementation locally. 1999-12-25 Shinya Hanataka <hanataka@abyss.rim.or.jp> * locale/programs/ld-ctype.c (allocate_arrays): Correctly assign transformation values for chars >255. * wctype/wctrans.c: Return pointer unmodified.
Diffstat (limited to 'wcsmbs')
| -rw-r--r-- | wcsmbs/wcsxfrm.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/wcsmbs/wcsxfrm.c b/wcsmbs/wcsxfrm.c index e41251f559..99a359399e 100644 --- a/wcsmbs/wcsxfrm.c +++ b/wcsmbs/wcsxfrm.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. @@ -19,16 +19,23 @@ #include <wchar.h> -#define WIDE_VERSION 1 -#define STRING_TYPE wchar_t -#define USTRING_TYPE wint_t -#define L_(Ch) L##Ch #ifdef USE_IN_EXTENDED_LOCALE_MODEL # define STRXFRM __wcsxfrm_l #else # define STRXFRM wcsxfrm #endif -#define STRLEN __wcslen -#define STPNCPY __wcpncpy -#include <string/strxfrm.c> + +#ifndef USE_IN_EXTENDED_LOCALE_MODEL +size_t +STRXFRM (wchar_t *dest, const wchar_t *src, size_t n) +#else +size_t +STRXFRM (wchar_t *dest, const wchar_t *src, size_t n, __locale_t l) +#endif +{ + if (n != 0) + __wcpncpy (dest, src, n); + + return __wcslen (src); +} |