Mercurial > gnulib

changeset 31201:ab910e12d3a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Trivial simplification of last commit.
author Bruno Haible <bruno@clisp.org>
date Sun, 26 Apr 2009 15:48:57 +0200
parents 77113b8e5bf6
children e6d07276434f
files lib/uniconv/u-conv-to-enc.h lib/uniconv/u8-conv-to-enc.c
diffstat 2 files changed, 8 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/lib/uniconv/u-conv-to-enc.h	Sun Apr 26 15:31:18 2009 +0200
+++ b/lib/uniconv/u-conv-to-enc.h	Sun Apr 26 15:48:57 2009 +0200
@@ -25,7 +25,6 @@
   size_t *scaled_offsets;
   char *result;
   size_t length;
-  int retval;
 
   if (offsets != NULL && srclen > 0)
     {
@@ -42,11 +41,10 @@
 
   result = resultbuf;
   length = *lengthp;
-  retval = mem_iconveha ((const char *) src, srclen * sizeof (UNIT),
-			 UTF_NAME, tocode,
-			 handler == iconveh_question_mark, handler,
-			 scaled_offsets, &result, &length);
-  if (retval < 0)
+  if (mem_iconveha ((const char *) src, srclen * sizeof (UNIT),
+		    UTF_NAME, tocode,
+		    handler == iconveh_question_mark, handler,
+		    scaled_offsets, &result, &length) < 0)
     {
       int saved_errno = errno;
       free (scaled_offsets);
--- a/lib/uniconv/u8-conv-to-enc.c	Sun Apr 26 15:31:18 2009 +0200
+++ b/lib/uniconv/u8-conv-to-enc.c	Sun Apr 26 15:48:57 2009 +0200
@@ -70,13 +70,11 @@
     {
       char *result = resultbuf;
       size_t length = *lengthp;
-      int retval =
-	mem_iconveha ((const char *) src, srclen,
-		      "UTF-8", tocode,
-		      handler == iconveh_question_mark, handler,
-		      offsets, &result, &length);
 
-      if (retval < 0)
+      if (mem_iconveha ((const char *) src, srclen,
+			"UTF-8", tocode,
+			handler == iconveh_question_mark, handler,
+			offsets, &result, &length) < 0)
 	return NULL;
 
       if (result == NULL) /* when (resultbuf == NULL && length == 0)  */