diff options
| author | Richard Sandiford <richard@codesourcery.com> | 2013-09-13 23:31:10 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2013-09-13 23:31:10 +0000 |
| commit | 08ffcf34d9a371b522419addbaa13e26b528bb35 (patch) | |
| tree | ff7beeab4f3a82dd823c0b9039cbb4e9ab195831 | |
| parent | ba0d798c17cafecd97b2cadf8b5e19800b967f82 (diff) | |
| download | glibc-08ffcf34d9a371b522419addbaa13e26b528bb35.tar.gz glibc-08ffcf34d9a371b522419addbaa13e26b528bb35.tar.xz glibc-08ffcf34d9a371b522419addbaa13e26b528bb35.zip | |
Fix some types in localedef.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | locale/programs/ld-ctype.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 8f264da42d..b6bf6c3262 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-09-13 Richard Sandiford <richard@codesourcery.com> + + * locale/programs/ld-ctype.c (find_idx): Use uint32_t in + prototype. + (ctype_startup): Use uint32_t in cast and sizeof for + ctype->charnames. + 2013-09-11 Jia Liu <proljc@gmail.com> * sunrpc/rpc/types.h [__APPLE_CC__]: Define __u_char_defined and diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index 3903ee0bce..1696294459 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -270,7 +270,7 @@ static void ctype_map_new (struct linereader *lr, struct locale_ctype_t *ctype, const char *name, const struct charmap_t *charmap); static uint32_t *find_idx (struct locale_ctype_t *ctype, uint32_t **table, - size_t *max, size_t *act, unsigned int idx); + size_t *max, size_t *act, uint32_t idx); static void set_class_defaults (struct locale_ctype_t *ctype, const struct charmap_t *charmap, struct repertoire_t *repertoire); @@ -311,9 +311,8 @@ ctype_startup (struct linereader *lr, struct localedef_t *locale, /* We have seen no names yet. */ ctype->charnames_max = charmap->mb_cur_max == 1 ? 256 : 512; - ctype->charnames = - (unsigned int *) xmalloc (ctype->charnames_max - * sizeof (unsigned int)); + ctype->charnames = (uint32_t *) xmalloc (ctype->charnames_max + * sizeof (uint32_t)); for (cnt = 0; cnt < 256; ++cnt) ctype->charnames[cnt] = cnt; ctype->charnames_act = 256; |