diff options
| author | Roland McGrath <roland@gnu.org> | 2002-09-24 04:24:25 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-09-24 04:24:25 +0000 |
| commit | 57b36a0a75d5a7577758d5238da92594f8151a81 (patch) | |
| tree | 865bbace51da7fed890a61ea49f0d4c8c93a3ba8 /catgets | |
| parent | d45c148997ad2c7cac00e8c00ab3fd7d106d9c04 (diff) | |
* catgets/open_catalog.c (__open_catalog): Don't use a value type
as the __builtin_expect expression, just the Boolean value.
* sysdeps/generic/wordexp.c (parse_glob): int -> size_t for counter.
* sysdeps/unix/sysv/linux/opensock.c (__opensock): Likewise.
* resolv/res_hconf.c (arg_service_list, parse_line): Likewise.
* iconvdata/tst-loading.c (main): Likewise.
* catgets/tst-catgets.c (main): Likewise.
* stdlib/tst-xpg-basename.c (main): Likewise.
* stdlib/tst-bsearch.c (main): Likewise.
* stdio-common/test-vfprintf.c (main): Likewise.
* stdio-common/tst-rndseek.c (do_test): Likewise.
* libio/tst_swprintf.c (main): Likewise.
* libio/tst-fgetws.c (main): Likewise.
* wcsmbs/tst-mbrtowc.c (check_ascii): Likewise.
* time/tst-posixtz.c (main): Likewise.
* time/tst-strptime.c (test_tm): Likewise.
* time/tst-strptime.c (main): Likewise.
* time/tst-getdate.c (main): Likewise.
* posix/tst-mmap.c (main): Likewise.
* posix/tst-getaddrinfo.c (do_test): Likewise.
* io/tst-getcwd.c (do_test): Likewise.
* resolv/tst-aton.c (main): Likewise.
* inet/tst-network.c (main): Likewise.
* libio/tst-fgetws.c (main): Likewise.
* sysdeps/posix/sprofil.c (add_region): int -> unsigned int for I.
* sysdeps/unix/sysv/linux/ptsname.c (__ptsname_r): int -> unsigned int
for PTYNO.
* stdlib/msort.c (qsort): Add a cast to silence warning.
* stdio-common/vfprintf.c (process_string_arg): Likewise.
* libio/oldfileops.c (_IO_old_do_write): Likewise.
* sysdeps/unix/sysv/linux/getcwd.c (__getcwd): Likewise.
* sysdeps/unix/sysv/linux/ttyname.c (ttyname): Likewise.
* sysdeps/unix/sysv/linux/gethostid.c (gethostid): Likewise.
* argp/argp-fmtstream.c (__argp_fmtstream_printf): Likewise.
* nscd/nscd_getgr_r.c (nscd_getgr_r): Likewise.
* sysdeps/unix/grantpt.c (grantpt): Likewise.
* libio/tst-widetext.c (main): Likewise.
* libio/tst-mmap2-eofsync.c (do_test): Likewise.
* rt/tst-aio.c (test_file): Likewise.
* rt/tst-aio64.c (test_file): Likewise.
* resolv/tst-aton.c (main): Likewise.
* catgets/catgetsinfo.h (CATGETS_MAGIC): Use U suffix on the constant.
* ctype/ctype.c (__ctype_tolower, __ctype_toupper): Cast to int32_t
instead of uint32_t in these macros.
Diffstat (limited to 'catgets')
| -rw-r--r-- | catgets/catgetsinfo.h | 2 | ||||
| -rw-r--r-- | catgets/open_catalog.c | 3 | ||||
| -rw-r--r-- | catgets/tst-catgets.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/catgets/catgetsinfo.h b/catgets/catgetsinfo.h index 4fdf47aace..5c993f753a 100644 --- a/catgets/catgetsinfo.h +++ b/catgets/catgetsinfo.h @@ -48,7 +48,7 @@ typedef struct catalog_info /* The magic number to signal we really have a catalog file. */ -#define CATGETS_MAGIC 0x960408de +#define CATGETS_MAGIC 0x960408deU /* Prototypes for helper functions. */ diff --git a/catgets/open_catalog.c b/catgets/open_catalog.c index cdcc7b83b8..674a0c1bf0 100644 --- a/catgets/open_catalog.c +++ b/catgets/open_catalog.c @@ -253,8 +253,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var, /* Determine whether the file is a catalog file and if yes whether it is written using the correct byte order. Else we have to swap the values. */ - if (__builtin_expect (catalog->file_ptr->magic, CATGETS_MAGIC) - == CATGETS_MAGIC) + if (__builtin_expect (catalog->file_ptr->magic == CATGETS_MAGIC, 1)) swapping = 0; else if (catalog->file_ptr->magic == SWAPU32 (CATGETS_MAGIC)) swapping = 1; diff --git a/catgets/tst-catgets.c b/catgets/tst-catgets.c index 249e89f7e0..9936554200 100644 --- a/catgets/tst-catgets.c +++ b/catgets/tst-catgets.c @@ -26,7 +26,7 @@ main (void) for (rnd = 0; rnd < ROUNDS; ++rnd) { nl_catd cd = catopen ("libc", 0); - int cnt; + size_t cnt; if (cd == (nl_catd) -1) { |