summary refs log tree commit diff
path: root/iconv
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-03-25 03:54:03 +0000
committerRoland McGrath <roland@gnu.org>2004-03-25 03:54:03 +0000
commitdb2f05ba83cd9eaae24b30166816e5169bbae2c0 (patch)
tree0e742754c54aafc31d38af146808d06300a65286 /iconv
parent61044c288ab5c7c4687205b0bf136e5358bfe1d1 (diff)
downloadglibc-db2f05ba83cd9eaae24b30166816e5169bbae2c0.tar.gz
glibc-db2f05ba83cd9eaae24b30166816e5169bbae2c0.tar.xz
glibc-db2f05ba83cd9eaae24b30166816e5169bbae2c0.zip
* Makerules ($(common-objpfx)shlib.lds): Don't use \n in rhs of sed
	substitutions; the semicolon terminators are enough for ld anyway.

	* elf/dl-deps.c (_dl_map_object_deps): Use alloca instead of
	dynamically sized auto array in function already using alloca.
	* locale/programs/ld-ctype.c (ctype_output): Likewise.
	* locale/programs/ld-time.c (time_output): Likewise.
	* elf/dl-misc.c (_dl_debug_vdprintf): Use macro instead of const for
	IOV array size.
	* locale/programs/charmap.c (charmap_read): Avoid alloca (or strdupa)
	when also using dynamically-sized auto array.
	* locale/programs/locfile.c (locfile_read): Likewise.
	* locale/programs/repertoire.c (repertoire_read): Likewise.
	* nis/nis_print_group_entry.c (nis_print_group_entry): Likewise.
	* locale/programs/locarchive.c (enlarge_archive): Likewise.
	* posix/annexc.c (check_header): Likewise.

	* iconv/gconv_int.h (norm_add_slashes): Don't handle null SUFFIX.
	strlen ("") gets optimized away just as well.
	* intl/loadmsgcat.c (_nl_init_domain_conv): Update caller.
	* wcsmbs/wcsmbsload.c (__wcsmbs_load_conv): Likewise.
Diffstat (limited to 'iconv')
-rw-r--r--iconv/gconv_int.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h
index 782e16a58a..36d4ae2d44 100644
--- a/iconv/gconv_int.h
+++ b/iconv/gconv_int.h
@@ -137,7 +137,7 @@ __libc_lock_define (extern, __gconv_lock);
     char *result;							      \
     char *tmp;								      \
     size_t cnt = 0;							      \
-    size_t suffix_len = (suffix) == NULL ? 0 : strlen (suffix);		      \
+    const size_t suffix_len = strlen (suffix);				      \
 									      \
     while (*cp != '\0')							      \
       if (*cp++ == '/')							      \
@@ -153,7 +153,7 @@ __libc_lock_define (extern, __gconv_lock);
 	if (cnt < 1)							      \
 	  {								      \
 	    *tmp++ = '/';						      \
-	    if (suffix != NULL)						      \
+	    if (suffix_len != 0)					      \
 	      tmp = __mempcpy (tmp, suffix, suffix_len);		      \
 	  }								      \
       }									      \