about summary refs log tree commit diff
path: root/iconv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-09-09 11:53:19 +0000
committerUlrich Drepper <drepper@redhat.com>1998-09-09 11:53:19 +0000
commit6e4c40baacfd7eaf1578f707759d79b5d95d626c (patch)
treeebea3ca25b71a1f21e657b7ab8a506f640197d79 /iconv
parent7fd18ea2de82bb4f0e393aee1dc412cd025f3be8 (diff)
downloadglibc-6e4c40baacfd7eaf1578f707759d79b5d95d626c.tar.gz
glibc-6e4c40baacfd7eaf1578f707759d79b5d95d626c.tar.xz
glibc-6e4c40baacfd7eaf1578f707759d79b5d95d626c.zip
Update.
1998-09-09 09:32  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/powerpc/dl-machine.h (elf_machine_rela): Make function
	inline.

1998-09-07  Paul Eggert  <eggert@twinsun.com>

	* time/mktime.c (__EXTENSIONS__): Define if not defined.
	(_REENTRANT): Remove.  It has undesirable consequences in
	Solaris 2.6 (e.g. it turns off the putc macro).  Defining
	__EXTENSIONS__ makes localtime_r and gmtime_r visible, which
	is what we want.
	* time/strftime.c: Likewise.

1998-09-08  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* elf/dl-error.c: Fix spelling.

1998-09-08  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* stdlib/strfmon.c: Quiet -Wparentheses warnings.
	* stdio-common/_itoa.c: Likewise.
	* stdio-common/printf_fp.c: Likewise.
	* stdio-common/vfscanf.c: Likewise.
	* wcsmbs/wcstok.c: Likewise.
	* sysdeps/generic/glob.c: Likewise.
	* posix/getopt.c: Likewise.
	* sysdeps/posix/getaddrinfo.c: Likewise.
	* posix/wordexp.c: Likewise.
	* io/ftw.c: Likewise.
	* io/fts.c: Likewise.
	* misc/getpass.c: Likewise.
	* iconv/gconv_conf.c: Likewise.
	* argp/argp-fmtstream.c: Likewise.
	* argp/argp-help.c: Likewise.
	* elf/dl-load.c: Likewise.
	* locale/programs/stringtrans.c: Likewise.
	* catgets/gencat.c: Likewise.
	* posix/getconf.c: Likewise.
	* iconv/gconv_conf.c: Likewise.
	* iconv/iconv_prog.c: Likewise.

	* string/strcoll.c: Optimize a few expressions.
	* string/strxfrm.c: Likewise.

1998-09-08  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* elf/dl-open.c (dl_open_worker): Move decl of new_global up one
	level to avoid uninit variable warning.

1998-09-09 10:34  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
	instead of _dl_default_scope[2] as argument to _dl_init_next.
	Fix compatibility problems introduced in last change.
Diffstat (limited to 'iconv')
-rw-r--r--iconv/gconv_conf.c12
-rw-r--r--iconv/iconv_prog.c12
2 files changed, 14 insertions, 10 deletions
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
index e58091a163..4ab924a3de 100644
--- a/iconv/gconv_conf.c
+++ b/iconv/gconv_conf.c
@@ -291,11 +291,13 @@ add_module (char *rp, const char *directory, size_t dir_len, void **modules,
 	memcpy (tmp - 1, gconv_module_ext, sizeof (gconv_module_ext));
 
       if (__tfind (new_module, modules, module_compare) == NULL)
-	if (__tsearch (new_module, modules, module_compare) == NULL)
-	  /* Something went wrong while inserting the new module.  */
-	  free (new_module);
-	else
-	  ++*nmodules;
+	{
+	  if (__tsearch (new_module, modules, module_compare) == NULL)
+	    /* Something went wrong while inserting the new module.  */
+	    free (new_module);
+	  else
+	    ++*nmodules;
+	}
     }
 }
 
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index f12a69020e..7dd0f3422c 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -139,11 +139,13 @@ main (int argc, char *argv[])
   /* Let's see whether we have these coded character sets.  */
   cd = iconv_open (to_code, from_code);
   if (cd == (iconv_t) -1)
-    if (errno == EINVAL)
-      error (EXIT_FAILURE, 0, _("conversion from `%s' to `%s' not supported"),
-	     from_code, to_code);
-    else
-      error (EXIT_FAILURE, errno, _("failed to start conversion processing"));
+    {
+      if (errno == EINVAL)
+	error (EXIT_FAILURE, 0, _("conversion from `%s' to `%s' not supported"),
+	       from_code, to_code);
+      else
+	error (EXIT_FAILURE, errno, _("failed to start conversion processing"));
+    }
 
   /* Determine output file.  */
   if (output_file != NULL)