aboutsummaryrefslogtreecommitdiff
path: root/iconv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-08-25 04:51:08 +0000
committerUlrich Drepper <drepper@redhat.com>2002-08-25 04:51:08 +0000
commit6dd67bd565db889944d740379e6ae87bd3fd4e44 (patch)
tree57e0f1549fe4d23dc1b6b6ba939904739d2f6a29 /iconv
parente2dced828ea26102bd9599acd9fc43bf944e37be (diff)
downloadglibc-6dd67bd565db889944d740379e6ae87bd3fd4e44.tar
glibc-6dd67bd565db889944d740379e6ae87bd3fd4e44.tar.gz
glibc-6dd67bd565db889944d740379e6ae87bd3fd4e44.tar.bz2
glibc-6dd67bd565db889944d740379e6ae87bd3fd4e44.zip
Update.
2002-08-24 Ulrich Drepper <drepper@redhat.com> * locale/programs/charmap.c (charmap_new_char): Don't use ULONG_MAX as maximum UCS4 value. * sysdeps/unix/sysv/linux/ia64/sys/user.h: New file. * sysdeps/generic/strtol.c: We don't need the isascii test in glibc. * malloc/hooks.c (public_sET_STATe): use size_t as type for i. * malloc/malloc.c (mALLINFo): Likewise. * libio/wstrops.c (_IO_wstr_pbackfail): Use WEOF in comparison. * libio/wfileops.c (_IO_wfile_overflow): Use EOF not WEOF when examining result of _IO_do_flush call. * stdio-common/vfprintf.c (vfprintf): Use correct type in va_arg. Use prec not spec when sizing buffers. * catgets/open_catalog.c (__open_catalog): Add casts to avoid warnings. * locale/loadarchive.c (_nl_load_locale_from_archive): Likewise. * locale/loadlocale.c (_nl_intern_locale_data): Likewise. * stdio-common/vfscanf.c (inchar): Likewise. * misc/efgcvt_r.c (fcvt_r): Likewise. * elf/dl-misc.c (_dl_debug_vdprintf): Likewise. * elf/readlib.c (process_file): Likewise. * elf/sprof.c (load_profdata): Likewise. * sysdeps/ia64/hp-timing.h (HP_TIMING_PRINT): Likewise. * locale/programs/linereader.c (get_toplvl_escape): Likewise. * locale/programs/charmap.c (charmap_read): Likewise. * libio/fileops.c: Likewise. * libio/fmemopen.c: Likewise. * stdlib/strtod.c: Likewise. * elf/dl-load.c: Likewise. * iconv/iconvconfig.c: Likewise. * iconv/iconv_prog.c (process_block): Likewise. * sysdeps/unix/sysv/linux/ia64/Makefile: Define _ASM_IA64_CURRENT_H macro to calm down the compiler. * iconv/gconv_cache.c (__gconv_load_cache): Add cast to avoid warning. * sysdeps/ia64/elf/initfini.c: Don't use newlines embedded in string. * sysdeps/unix/sysv/linux/i386/sysdep.S: Update comment regarding placement of errno definition. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/mips/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S: Likewise. * resolv/nss_dns/dns-host.c (MAXPACKET): Increase minimum value from 1024 to 65536, to avoid buffer overrun. 2002-08-16 Paul Eggert <eggert@twinsun.com> * resolv/gethnamaddr.c (MAXPACKET): Increase minimum value from 1024 to 65536, to avoid buffer overrun. * resolv/res_query.c (MAXPACKET): Likewise. architectures.
Diffstat (limited to 'iconv')
-rw-r--r--iconv/gconv_cache.c2
-rw-r--r--iconv/iconv_prog.c6
-rw-r--r--iconv/iconvconfig.c16
3 files changed, 13 insertions, 11 deletions
diff --git a/iconv/gconv_cache.c b/iconv/gconv_cache.c
index 56d8c37519..f7dca0285a 100644
--- a/iconv/gconv_cache.c
+++ b/iconv/gconv_cache.c
@@ -67,7 +67,7 @@ __gconv_load_cache (void)
if (__builtin_expect (__fxstat64 (_STAT_VER, fd, &st), 0) < 0
/* We do not have to start looking at the file if it cannot contain
at least the cache header. */
- || st.st_size < sizeof (struct gconvcache_header))
+ || (size_t) st.st_size < sizeof (struct gconvcache_header))
{
close_and_exit:
__close (fd);
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 8a8535bf50..a67c6ebad1 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -410,7 +410,8 @@ process_block (iconv_t cd, char *addr, size_t len, FILE *output)
/* We have something to write out. */
int errno_save = errno;
- if (fwrite (outbuf, 1, outptr - outbuf, output) < outptr - outbuf
+ if (fwrite (outbuf, 1, outptr - outbuf, output)
+ < (size_t) (outptr - outbuf)
|| ferror (output))
{
/* Error occurred while printing the result. */
@@ -435,7 +436,8 @@ conversion stopped due to problem in writing the output"));
/* We have something to write out. */
int errno_save = errno;
- if (fwrite (outbuf, 1, outptr - outbuf, output) < outptr - outbuf
+ if (fwrite (outbuf, 1, outptr - outbuf, output)
+ < (size_t) (outptr - outbuf)
|| ferror (output))
{
/* Error occurred while printing the result. */
diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
index 27b8b02dac..62e3e4e413 100644
--- a/iconv/iconvconfig.c
+++ b/iconv/iconvconfig.c
@@ -441,8 +441,8 @@ add_alias (char *rp)
return;
*wp++ = '\0';
- assert (strlen (from) + 1 == to - from);
- assert (strlen (to) + 1 == wp - to);
+ assert (strlen (from) + 1 == (size_t) (to - from));
+ assert (strlen (to) + 1 == (size_t) (wp - to));
new_alias (from, to - from, to, wp - to);
}
@@ -604,15 +604,15 @@ add_module (char *rp, const char *directory)
/* See whether we must add the ending. */
need_ext = 0;
- if (wp - module < sizeof (gconv_module_ext)
+ if ((size_t) (wp - module) < sizeof (gconv_module_ext)
|| memcmp (wp - sizeof (gconv_module_ext), gconv_module_ext,
sizeof (gconv_module_ext)) != 0)
/* We must add the module extension. */
need_ext = sizeof (gconv_module_ext) - 1;
- assert (strlen (from) + 1 == to - from);
- assert (strlen (to) + 1 == module - to);
- assert (strlen (module) + 1 == wp - module);
+ assert (strlen (from) + 1 == (size_t) (to - from));
+ assert (strlen (to) + 1 == (size_t) (module - to));
+ assert (strlen (module) + 1 == (size_t) (wp - module));
new_module (from, to - from, to, module - to, directory, module, wp - module,
cost, need_ext);
@@ -1179,7 +1179,7 @@ write_output (void)
total += iov[idx].iov_len;
++idx;
- assert (cur_extra_table - extra_table
+ assert ((size_t) (cur_extra_table - extra_table)
<= ((sizeof (struct extra_entry) + sizeof (gidx_t)
+ sizeof (struct extra_entry_module))
* nextra_modules));
@@ -1189,7 +1189,7 @@ write_output (void)
total += iov[idx].iov_len;
++idx;
- if (TEMP_FAILURE_RETRY (writev (fd, iov, idx)) != total
+ if ((size_t) TEMP_FAILURE_RETRY (writev (fd, iov, idx)) != total
/* The file was created with mode 0600. Make it world-readable. */
|| fchmod (fd, 0644) != 0
/* Rename the file, possibly replacing an old one. */