diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2010-03-26 21:08:35 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2010-03-26 21:08:35 +0000 |
commit | 30feca091914f8d41f452394367677bfe56b3316 (patch) | |
tree | b9f750862b34524d3bcf230ab749d293e9caebc8 /libc/locale | |
parent | 5c92b8030ed5819dd183df7cc3cfb085317beb16 (diff) |
Merge changes between r10031 and r10115 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@10116 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/locale')
-rw-r--r-- | libc/locale/programs/locale.c | 10 | ||||
-rw-r--r-- | libc/locale/programs/localedef.c | 8 | ||||
-rw-r--r-- | libc/locale/programs/simple-hash.c | 2 | ||||
-rw-r--r-- | libc/locale/programs/simple-hash.h | 3 | ||||
-rw-r--r-- | libc/locale/setlocale.c | 4 |
5 files changed, 15 insertions, 12 deletions
diff --git a/libc/locale/programs/locale.c b/libc/locale/programs/locale.c index 74924e5ec..23ccd0e84 100644 --- a/libc/locale/programs/locale.c +++ b/libc/locale/programs/locale.c @@ -1,5 +1,5 @@ /* Implementation of the locale program according to POSIX 9945-2. - Copyright (C) 1995-1997, 1999-2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 1999-2008, 2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995. @@ -144,7 +144,7 @@ struct category #define DEFINE_CATEGORY(category, name, items, postload) \ static struct cat_item category##_desc[] = \ { \ - NO_PAREN items \ + NO_PAREN items \ }; #include "categories.def" @@ -297,7 +297,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2009"); +"), "2010"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } @@ -542,7 +542,7 @@ write_locales (void) because a) we are only interested in the first two fields b) these fields must be usable as file names and so must - not be that long */ + not be that long */ char buf[BUFSIZ]; char *alias; char *value; @@ -889,7 +889,7 @@ show_info (const char *name) while (cnt > 1) { printf ("%d;", *val == '\177' ? -1 : *val); - --cnt; + --cnt; ++val; } diff --git a/libc/locale/programs/localedef.c b/libc/locale/programs/localedef.c index 0b2f81c7c..756e66728 100644 --- a/libc/locale/programs/localedef.c +++ b/libc/locale/programs/localedef.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1995-2008, 2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995. @@ -384,8 +384,8 @@ more_help (int key, const char *text, void *input) /* We print some extra information. */ if (asprintf (&cp, gettext ("\ System's directory for character maps : %s\n\ - repertoire maps: %s\n\ - locale path : %s\n\ + repertoire maps: %s\n\ + locale path : %s\n\ %s"), CHARMAP_PATH, REPERTOIREMAP_PATH, LOCALE_PATH, gettext ("\ For bug reporting instructions, please see:\n\ @@ -407,7 +407,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2009"); +"), "2010"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/libc/locale/programs/simple-hash.c b/libc/locale/programs/simple-hash.c index 5bd65f247..b9cc237e4 100644 --- a/libc/locale/programs/simple-hash.c +++ b/libc/locale/programs/simple-hash.c @@ -21,6 +21,7 @@ # include <config.h> #endif +#include <inttypes.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -49,6 +50,7 @@ # define bcopy(s, d, n) memcpy ((d), (s), (n)) #endif +#define hashval_t uint32_t #include "hashval.h" extern void *xmalloc (size_t __n); diff --git a/libc/locale/programs/simple-hash.h b/libc/locale/programs/simple-hash.h index b41c233b0..e0c32bcc3 100644 --- a/libc/locale/programs/simple-hash.h +++ b/libc/locale/programs/simple-hash.h @@ -19,6 +19,7 @@ #ifndef _SIMPLE_HASH_H #define _SIMPLE_HASH_H +#include <inttypes.h> #include <obstack.h> typedef struct hash_table @@ -45,7 +46,7 @@ extern int iterate_table (const hash_table *htab, void **ptr, const void **key, size_t *keylen, void **data) __THROW; -extern unsigned long int compute_hashval (const void *key, size_t keylen) +extern uint32_t compute_hashval (const void *key, size_t keylen) __THROW; extern unsigned long int next_prime (unsigned long int seed) __THROW; diff --git a/libc/locale/setlocale.c b/libc/locale/setlocale.c index fad726287..58daaf1f5 100644 --- a/libc/locale/setlocale.c +++ b/libc/locale/setlocale.c @@ -435,7 +435,7 @@ libc_hidden_def (setlocale) static void __libc_freeres_fn_section free_category (int category, - struct __locale_data *here, struct locale_data *c_data) + struct __locale_data *here, struct __locale_data *c_data) { struct loaded_l10nfile *runp = _nl_locale_file_list[category]; @@ -451,7 +451,7 @@ free_category (int category, while (runp != NULL) { struct loaded_l10nfile *curr = runp; - struct __locale_data *data = (struct locale_data *) runp->data; + struct __locale_data *data = (struct __locale_data *) runp->data; if (data != NULL && data != c_data) _nl_unload_locale (data); |