1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00

* locale/programs/xmalloc.c: Test _LIBC as well as STDC_HEADERS.

* locale/programs/ld-collate.c (collate_finish): Use error_at_line
	instead of error_with_loc.

	* locale/weight.h: Use u_int32_t instead of u32_t.
	* string/strxfrm.c: Likewise.

	* string/strxfrm.c: Find weight.h in ../locale; don't #include
	"localeinfo.h".
	* string/strcoll.c: Likewise.

	* locale/programs/simple-hash.c, locale/programs/simple-hash.h,
 	locale/programs/xmalloc.c, locale/programs/xstrdup.c: Helper functions
 	for locale related programs.
 	locale/programs/charmap.c, locale/programs/charset.c,
 	locale/programs/charset.h, locale/programs/config.h,
 	locale/programs/ctypedump.c, locale/programs/ld-collate.c,
 	locale/programs/ld-ctype.c, locale/programs/ld-messages.c,
 	locale/programs/ld-monetary.c, locale/programs/ld-numeric.c,
 	locale/programs/ld-time.c, locale/programs/linereader.c,
 	locale/programs/linereader.h, locale/programs/locale.c,
 	locale/programs/localedef.c, locale/programs/locales.h,
 	locale/programs/locfile-kw.gperf, locale/programs/locfile-kw.h,
 	locale/programs/locfile-token.h, locale/programs/locfile.c,
 	locale/programs/locfile.h, locale/programs/stringtrans.c,
 	locale/programs/stringtrans.h: Implementation of locale related
 	programs.
This commit is contained in:
Roland McGrath
1996-03-28 09:16:15 +00:00
parent 19bc17a905
commit 0393dfd6c2
21 changed files with 801 additions and 147 deletions

View File

@ -20,7 +20,6 @@ Boston, MA 02111-1307, USA. */
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include "localeinfo.h"
#ifndef STRING_TYPE
# define STRING_TYPE char
@ -32,16 +31,15 @@ Boston, MA 02111-1307, USA. */
/* Include the shared helper functions. `strxfrm'/`wcsxfrm' also use
these functions. */
#include "weight.h"
#include "../locale/weight.h"
/* Write 32 bit value UTF-8 encoded but only if enough space is left. */
static __inline size_t
print_val (value, dest, max, act)
u32_t value;
STRING_TYPE *dest;
size_t max;
size_t act;
print_val (u_int32_t value,
STRING_TYPE *dest,
size_t max,
size_t act)
{
char tmp[6];
int idx = 0;
@ -139,7 +137,7 @@ STRXFRM (dest, src, n)
do
{
int ignore = 0;
u32_t w;
u_int32_t w;
/* Here we have to check for IGNORE entries. If these are
found we count them and go on witht he next value. */