diff options
Diffstat (limited to 'locale/programs')
38 files changed, 82 insertions, 129 deletions
diff --git a/locale/programs/3level.h b/locale/programs/3level.h index 5602fd8d88..19c7daf731 100644 --- a/locale/programs/3level.h +++ b/locale/programs/3level.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2015 Free Software Foundation, Inc. +/* Copyright (C) 2000-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c index cf7adea1b5..99fcd355e0 100644 --- a/locale/programs/charmap-dir.c +++ b/locale/programs/charmap-dir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2015 Free Software Foundation, Inc. +/* Copyright (C) 2000-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify diff --git a/locale/programs/charmap-dir.h b/locale/programs/charmap-dir.h index 33cd062538..c8c916b4f6 100644 --- a/locale/programs/charmap-dir.h +++ b/locale/programs/charmap-dir.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2015 Free Software Foundation, Inc. +/* Copyright (C) 2000-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify diff --git a/locale/programs/charmap-kw.gperf b/locale/programs/charmap-kw.gperf index 2ce7493aa0..96cebcd721 100644 --- a/locale/programs/charmap-kw.gperf +++ b/locale/programs/charmap-kw.gperf @@ -1,5 +1,5 @@ %{ -/* Copyright (C) 1995-2015 Free Software Foundation, Inc. +/* Copyright (C) 1995-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper, <drepper@gnu.org>. diff --git a/locale/programs/charmap-kw.h b/locale/programs/charmap-kw.h index 9a8e5c761f..983d287880 100644 --- a/locale/programs/charmap-kw.h +++ b/locale/programs/charmap-kw.h @@ -30,7 +30,7 @@ #line 1 "charmap-kw.gperf" -/* Copyright (C) 1995-2015 Free Software Foundation, Inc. +/* Copyright (C) 1995-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper, <drepper@gnu.org>. diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c index 1685988003..d7580e05c4 100644 --- a/locale/programs/charmap.c +++ b/locale/programs/charmap.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2015 Free Software Foundation, Inc. +/* Copyright (C) 1996-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. diff --git a/locale/programs/charmap.h b/locale/programs/charmap.h index 08d7e1a623..9e7066f96c 100644 --- a/locale/programs/charmap.h +++ b/locale/programs/charmap.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2015 Free Software Foundation, Inc. +/* Copyright (C) 1996-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. diff --git a/locale/programs/config.h b/locale/programs/config.h index b5876a6525..f606365f2a 100644 --- a/locale/programs/config.h +++ b/locale/programs/config.h @@ -1,5 +1,5 @@ /* Configuration for localedef program. - Copyright (C) 1995-2015 Free Software Foundation, Inc. + Copyright (C) 1995-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995. diff --git a/locale/programs/ld-address.c b/locale/programs/ld-address.c index 0597e11539..f13331941e 100644 --- a/locale/programs/ld-address.c +++ b/locale/programs/ld-address.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2015 Free Software Foundation, Inc. +/* Copyright (C) 1998-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index a39a94f2cc..1e125f60fd 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2015 Free Software Foundation, Inc. +/* Copyright (C) 1995-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -32,7 +32,6 @@ #include "linereader.h" #include "locfile.h" #include "elem-hash.h" -#include "../localeinfo.h" /* Uncomment the following line in the production version. */ /* #define NDEBUG 1 */ @@ -2131,8 +2130,6 @@ collate_output (struct localedef_t *locale, const struct charmap_t *charmap, /* The words have to be handled specially. */ if (idx == _NL_ITEM_INDEX (_NL_COLLATE_SYMB_HASH_SIZEMB)) add_locale_uint32 (&file, 0); - else if (idx == _NL_ITEM_INDEX (_NL_COLLATE_ENCODING_TYPE)) - add_locale_uint32 (&file, __cet_other); else add_locale_empty (&file); } @@ -2496,12 +2493,6 @@ collate_output (struct localedef_t *locale, const struct charmap_t *charmap, add_locale_raw_data (&file, collate->mbseqorder, 256); add_locale_collseq_table (&file, &collate->wcseqorder); add_locale_string (&file, charmap->code_set_name); - if (strcmp (charmap->code_set_name, "UTF-8") == 0) - add_locale_uint32 (&file, __cet_utf8); - else if (charmap->mb_cur_max == 1) - add_locale_uint32 (&file, __cet_8bit); - else - add_locale_uint32 (&file, __cet_other); write_locale_data (output_path, LC_COLLATE, "LC_COLLATE", &file); obstack_free (&weightpool, NULL); diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index 3f464ef904..0fd141ca7e 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2015 Free Software Foundation, Inc. +/* Copyright (C) 1995-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. diff --git a/locale/programs/ld-identification.c b/locale/programs/ld-identification.c index 7932dc482b..1e8fa84712 100644 --- a/locale/programs/ld-identification.c +++ b/locale/programs/ld-identification.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2015 Free Software Foundation, Inc. +/* Copyright (C) 1998-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/locale/programs/ld-measurement.c b/locale/programs/ld-measurement.c index f66197f0db..c4f98111e3 100644 --- a/locale/programs/ld-measurement.c +++ b/locale/programs/ld-measurement.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2015 Free Software Foundation, Inc. +/* Copyright (C) 1998-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/locale/programs/ld-messages.c b/locale/programs/ld-messages.c index ec1a80b467..702190dad1 100644 --- a/locale/programs/ld-messages.c +++ b/locale/programs/ld-messages.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2015 Free Software Foundation, Inc. +/* Copyright (C) 1995-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. diff --git a/locale/programs/ld-monetary.c b/locale/programs/ld-monetary.c index 25270298df..8635d4fe5d 100644 --- a/locale/programs/ld-monetary.c +++ b/locale/programs/ld-monetary.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2015 Free Software Foundation, Inc. +/* Copyright (C) 1995-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. diff --git a/locale/programs/ld-name.c b/locale/programs/ld-name.c index 611eede3cf..b43bcc1c23 100644 --- a/locale/programs/ld-name.c +++ b/locale/programs/ld-name.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2015 Free Software Foundation, Inc. +/* Copyright (C) 1998-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/locale/programs/ld-numeric.c b/locale/programs/ld-numeric.c index 09244c636c..6e1d2b112e 100644 --- a/locale/programs/ld-numeric.c +++ b/locale/programs/ld-numeric.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2015 Free Software Foundation, Inc. +/* Copyright (C) 1995-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. diff --git a/locale/programs/ld-paper.c b/locale/programs/ld-paper.c index da4dae450f..24ea684c40 100644 --- a/locale/programs/ld-paper.c +++ b/locale/programs/ld-paper.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2015 Free Software Foundation, Inc. +/* Copyright (C) 1998-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/locale/programs/ld-telephone.c b/locale/programs/ld-telephone.c index 7e081d8d32..6c38449d2c 100644 --- a/locale/programs/ld-telephone.c +++ b/locale/programs/ld-telephone.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2015 Free Software Foundation, Inc. +/* Copyright (C) 1998-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c index db490c6cdf..ca31c9c81b 100644 --- a/locale/programs/ld-time.c +++ b/locale/programs/ld-time.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2015 Free Software Foundation, Inc. +/* Copyright (C) 1995-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c index 2e05130161..b885f65d1f 100644 --- a/locale/programs/linereader.c +++ b/locale/programs/linereader.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2015 Free Software Foundation, Inc. +/* Copyright (C) 1996-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. diff --git a/locale/programs/linereader.h b/locale/programs/linereader.h index 646915b887..5f423af44c 100644 --- a/locale/programs/linereader.h +++ b/locale/programs/linereader.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2015 Free Software Foundation, Inc. +/* Copyright (C) 1996-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper, <drepper@gnu.org>. diff --git a/locale/programs/locale-spec.c b/locale/programs/locale-spec.c index 9f1925d47d..80c9354dea 100644 --- a/locale/programs/locale-spec.c +++ b/locale/programs/locale-spec.c @@ -1,5 +1,5 @@ /* Handle special requests. - Copyright (C) 1996-2015 Free Software Foundation, Inc. + Copyright (C) 1996-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. diff --git a/locale/programs/locale.c b/locale/programs/locale.c index b1de17f0d2..6cb3d5ec64 100644 --- a/locale/programs/locale.c +++ b/locale/programs/locale.c @@ -1,5 +1,5 @@ /* Implementation of the locale program according to POSIX 9945-2. - Copyright (C) 1995-2015 Free Software Foundation, Inc. + Copyright (C) 1995-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995. @@ -45,7 +45,7 @@ #include "../locarchive.h" #include <programs/xmalloc.h> -#define ARCHIVE_NAME LOCALEDIR "/locale-archive" +#define ARCHIVE_NAME COMPLOCALEDIR "/locale-archive" /* If set print the name of the category. */ static int show_category_name; @@ -295,7 +295,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\ -"), "2015"); +"), "2016"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } @@ -325,9 +325,11 @@ select_dirs (const struct dirent *dirent) #endif { struct stat64 st; - char buf[sizeof (LOCALEDIR) + strlen (dirent->d_name) + 1]; + char buf[sizeof (COMPLOCALEDIR) + + strlen (dirent->d_name) + 1]; - stpcpy (stpcpy (stpcpy (buf, LOCALEDIR), "/"), dirent->d_name); + stpcpy (stpcpy (stpcpy (buf, COMPLOCALEDIR), "/"), + dirent->d_name); if (stat64 (buf, &st) == 0) mode = st.st_mode; @@ -444,17 +446,21 @@ write_locales (void) first_locale = 0; /* Now we can look for all files in the directory. */ - ndirents = scandir (LOCALEDIR, &dirents, select_dirs, alphasort); + ndirents = scandir (COMPLOCALEDIR, &dirents, select_dirs, + alphasort); for (cnt = 0; cnt < ndirents; ++cnt) { /* Test whether at least the LC_CTYPE data is there. Some directories only contain translations. */ - char buf[sizeof (LOCALEDIR) + strlen (dirents[cnt]->d_name) - + sizeof "/LC_IDENTIFICATION"]; + char buf[sizeof (COMPLOCALEDIR) + + strlen (dirents[cnt]->d_name) + + sizeof "/LC_IDENTIFICATION"]; char *enddir; struct stat64 st; - stpcpy (enddir = stpcpy (stpcpy (stpcpy (buf, LOCALEDIR), "/"), + stpcpy (enddir = stpcpy (stpcpy (stpcpy (buf, + COMPLOCALEDIR), + "/"), dirents[cnt]->d_name), "/LC_IDENTIFICATION"); diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index 2a0f2aa709..6becd9aa2e 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2015 Free Software Foundation, Inc. +/* Copyright (C) 1995-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995. @@ -286,7 +286,7 @@ cannot open locale definition file `%s'"), runp->name)); { if (cannot_write_why != 0) WITH_CUR_LOCALE (error (4, cannot_write_why, _("\ -cannot write output files to `%s'"), output_path)); +cannot write output files to `%s'"), output_path ? : argv[remaining])); else write_all_categories (locales, charmap, argv[remaining], output_path); } @@ -403,7 +403,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\ -"), "2015"); +"), "2016"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } @@ -457,11 +457,11 @@ construct_output_path (char *path) '/'. */ ssize_t n; if (normal == NULL) - n = asprintf (&result, "%s%s/%s%c", - output_prefix ?: "", LOCALEDIR, path, '\0'); + n = asprintf (&result, "%s%s/%s%c", output_prefix ?: "", + COMPLOCALEDIR, path, '\0'); else n = asprintf (&result, "%s%s/%.*s%s%s%c", - output_prefix ?: "", LOCALEDIR, + output_prefix ?: "", COMPLOCALEDIR, (int) (startp - path), path, normal, endp, '\0'); if (n < 0) @@ -504,9 +504,7 @@ construct_output_path (char *path) names. Normalization allows the user to use any of the common names. */ static const char * -normalize_codeset (codeset, name_len) - const char *codeset; - size_t name_len; +normalize_codeset (const char *codeset, size_t name_len) { int len = 0; int only_digit = 1; diff --git a/locale/programs/localedef.h b/locale/programs/localedef.h index 7e19ff0604..cb9386a798 100644 --- a/locale/programs/localedef.h +++ b/locale/programs/localedef.h @@ -1,5 +1,5 @@ /* General definitions for localedef(1). - Copyright (C) 1998-2015 Free Software Foundation, Inc. + Copyright (C) 1998-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c index 49f7f1b3cf..fadc3bfd43 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002-2015 Free Software Foundation, Inc. +/* Copyright (C) 2002-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -57,7 +57,7 @@ extern const char *output_prefix; -#define ARCHIVE_NAME LOCALEDIR "/locale-archive" +#define ARCHIVE_NAME COMPLOCALEDIR "/locale-archive" static const char *locnames[] = { @@ -1127,11 +1127,8 @@ add_locale (struct locarhandle *ah, of the files if necessary. Add all the names, possibly overwriting old files. */ int -add_locale_to_archive (ah, name, data, replace) - struct locarhandle *ah; - const char *name; - locale_data_t data; - bool replace; +add_locale_to_archive (struct locarhandle *ah, const char *name, + locale_data_t data, bool replace) { char *normalized_name = NULL; uint32_t locrec_offset; @@ -1329,10 +1326,7 @@ add_locale_to_archive (ah, name, data, replace) int -add_locales_to_archive (nlist, list, replace) - size_t nlist; - char *list[]; - bool replace; +add_locales_to_archive (size_t nlist, char *list[], bool replace) { struct locarhandle ah; int result = 0; @@ -1529,9 +1523,7 @@ add_locales_to_archive (nlist, list, replace) int -delete_locales_from_archive (nlist, list) - size_t nlist; - char *list[]; +delete_locales_from_archive (size_t nlist, char *list[]) { struct locarhandle ah; struct locarhead *head; diff --git a/locale/programs/locfile-kw.gperf b/locale/programs/locfile-kw.gperf index ab40f28d93..5fea6964ff 100644 --- a/locale/programs/locfile-kw.gperf +++ b/locale/programs/locfile-kw.gperf @@ -1,5 +1,5 @@ %{ -/* Copyright (C) 1996-2015 Free Software Foundation, Inc. +/* Copyright (C) 1996-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. diff --git a/locale/programs/locfile-kw.h b/locale/programs/locfile-kw.h index 0978861eed..16b87d415a 100644 --- a/locale/programs/locfile-kw.h +++ b/locale/programs/locfile-kw.h @@ -30,7 +30,7 @@ #line 1 "locfile-kw.gperf" -/* Copyright (C) 1996-2015 Free Software Foundation, Inc. +/* Copyright (C) 1996-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. diff --git a/locale/programs/locfile-token.h b/locale/programs/locfile-token.h index 10c9907b1f..d6e7a8b4ac 100644 --- a/locale/programs/locfile-token.h +++ b/locale/programs/locfile-token.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2015 Free Software Foundation, Inc. +/* Copyright (C) 1996-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c index 33da52e1ee..32f5cd2a79 100644 --- a/locale/programs/locfile.c +++ b/locale/programs/locfile.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2015 Free Software Foundation, Inc. +/* Copyright (C) 1996-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. diff --git a/locale/programs/locfile.h b/locale/programs/locfile.h index 6fc441b2d8..a3dd90412a 100644 --- a/locale/programs/locfile.h +++ b/locale/programs/locfile.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2015 Free Software Foundation, Inc. +/* Copyright (C) 1996-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. diff --git a/locale/programs/repertoire.c b/locale/programs/repertoire.c index e7b41eb7c7..c39870759c 100644 --- a/locale/programs/repertoire.c +++ b/locale/programs/repertoire.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2015 Free Software Foundation, Inc. +/* Copyright (C) 1998-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/locale/programs/repertoire.h b/locale/programs/repertoire.h index 559e127a07..a426a3cba6 100644 --- a/locale/programs/repertoire.h +++ b/locale/programs/repertoire.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2015 Free Software Foundation, Inc. +/* Copyright (C) 1998-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/locale/programs/simple-hash.c b/locale/programs/simple-hash.c index a4412f9787..a79539a1c9 100644 --- a/locale/programs/simple-hash.c +++ b/locale/programs/simple-hash.c @@ -1,5 +1,5 @@ /* Implement simple hashing table with string based keys. - Copyright (C) 1994-2015 Free Software Foundation, Inc. + Copyright (C) 1994-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, October 1994. @@ -66,9 +66,7 @@ static int is_prime (unsigned long int candidate); int -init_hash (htab, init_size) - hash_table *htab; - unsigned long int init_size; +init_hash (hash_table *htab, unsigned long int init_size) { /* We need the size to be a prime. */ init_size = next_prime (init_size); @@ -88,8 +86,7 @@ init_hash (htab, init_size) int -delete_hash (htab) - hash_table *htab; +delete_hash (hash_table *htab) { free (htab->table); obstack_free (&htab->mem_pool, NULL); @@ -98,11 +95,7 @@ delete_hash (htab) int -insert_entry (htab, key, keylen, data) - hash_table *htab; - const void *key; - size_t keylen; - void *data; +insert_entry (hash_table *htab, const void *key, size_t keylen, void *data) { unsigned long int hval = compute_hashval (key, keylen); hash_entry *table = (hash_entry *) htab->table; @@ -121,13 +114,8 @@ insert_entry (htab, key, keylen, data) } static void -insert_entry_2 (htab, key, keylen, hval, idx, data) - hash_table *htab; - const void *key; - size_t keylen; - unsigned long int hval; - size_t idx; - void *data; +insert_entry_2 (hash_table *htab, const void *key, size_t keylen, + unsigned long int hval, size_t idx, void *data) { hash_entry *table = (hash_entry *) htab->table; @@ -176,11 +164,8 @@ insert_entry_2 (htab, key, keylen, hval, idx, data) int -find_entry (htab, key, keylen, result) - const hash_table *htab; - const void *key; - size_t keylen; - void **result; +find_entry (const hash_table *htab, const void *key, size_t keylen, + void **result) { hash_entry *table = (hash_entry *) htab->table; size_t idx = lookup (htab, key, keylen, compute_hashval (key, keylen)); @@ -194,11 +179,7 @@ find_entry (htab, key, keylen, result) int -set_entry (htab, key, keylen, newval) - hash_table *htab; - const void *key; - size_t keylen; - void *newval; +set_entry (hash_table *htab, const void *key, size_t keylen, void *newval) { hash_entry *table = (hash_entry *) htab->table; size_t idx = lookup (htab, key, keylen, compute_hashval (key, keylen)); @@ -212,12 +193,8 @@ set_entry (htab, key, keylen, newval) int -iterate_table (htab, ptr, key, keylen, data) - const hash_table *htab; - void **ptr; - const void **key; - size_t *keylen; - void **data; +iterate_table (const hash_table *htab, void **ptr, const void **key, + size_t *keylen, void **data) { if (*ptr == NULL) { @@ -244,11 +221,8 @@ iterate_table (htab, ptr, key, keylen, data) [Knuth] The Art of Computer Programming, part3 (6.4) */ static size_t -lookup (htab, key, keylen, hval) - const hash_table *htab; - const void *key; - size_t keylen; - unsigned long int hval; +lookup (const hash_table *htab, const void *key, size_t keylen, + unsigned long int hval) { unsigned long int hash; size_t idx; @@ -287,8 +261,7 @@ lookup (htab, key, keylen, hval) unsigned long int -next_prime (seed) - unsigned long int seed; +next_prime (unsigned long int seed) { /* Make it definitely odd. */ seed |= 1; @@ -301,8 +274,7 @@ next_prime (seed) static int -is_prime (candidate) - unsigned long int candidate; +is_prime (unsigned long int candidate) { /* No even number and none less than 10 will be passed here. */ unsigned long int divn = 3; diff --git a/locale/programs/simple-hash.h b/locale/programs/simple-hash.h index a7f97769a8..cc3f85655c 100644 --- a/locale/programs/simple-hash.h +++ b/locale/programs/simple-hash.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2015 Free Software Foundation, Inc. +/* Copyright (C) 1995-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. diff --git a/locale/programs/xmalloc.c b/locale/programs/xmalloc.c index 36bc17fe89..7524fa5083 100644 --- a/locale/programs/xmalloc.c +++ b/locale/programs/xmalloc.c @@ -1,5 +1,5 @@ /* xmalloc.c -- malloc with out of memory checking - Copyright (C) 1990-2015 Free Software Foundation, Inc. + Copyright (C) 1990-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -52,8 +52,7 @@ void free (); int xmalloc_exit_failure = EXIT_FAILURE; static VOID * -fixup_null_alloc (n) - size_t n; +fixup_null_alloc (size_t n) { VOID *p; @@ -68,8 +67,7 @@ fixup_null_alloc (n) /* Allocate N bytes of memory dynamically, with error checking. */ VOID * -xmalloc (n) - size_t n; +xmalloc (size_t n) { VOID *p; @@ -82,8 +80,7 @@ xmalloc (n) /* Allocate memory for N elements of S bytes, with error checking. */ VOID * -xcalloc (n, s) - size_t n, s; +xcalloc (size_t n, size_t s) { VOID *p; @@ -98,9 +95,7 @@ xcalloc (n, s) If P is NULL, run xmalloc. */ VOID * -xrealloc (p, n) - VOID *p; - size_t n; +xrealloc (VOID *p, size_t n) { if (p == 0) return xmalloc (n); diff --git a/locale/programs/xstrdup.c b/locale/programs/xstrdup.c index a8fadb3d15..534ac56e36 100644 --- a/locale/programs/xstrdup.c +++ b/locale/programs/xstrdup.c @@ -1,5 +1,5 @@ /* xstrdup.c -- copy a string with out of memory checking - Copyright (C) 1990-2015 Free Software Foundation, Inc. + Copyright (C) 1990-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -30,8 +30,7 @@ char *xstrdup (char *string) __THROW; /* Return a newly allocated copy of STRING. */ char * -xstrdup (string) - char *string; +xstrdup (char *string) { return strcpy (xmalloc (strlen (string) + 1), string); } |