From: Bruno Haible <bruno@clisp.org>
Date: Tue, 13 Jul 2010 21:43:14 +0000 (+0200)
Subject: striconveh: Simplify last commit.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5432287a033855c8c7a36f3aa055e0db60fb3383;p=pspp

striconveh: Simplify last commit.
---

diff --git a/lib/striconveh.c b/lib/striconveh.c
index 9467e4dbd7..8d73d291fb 100644
--- a/lib/striconveh.c
+++ b/lib/striconveh.c
@@ -972,26 +972,21 @@ mem_cd_iconveh_internal (const char *src, size_t srclen,
       size_t memsize = length + extra_alloc;
 
       if (*resultp != NULL && *lengthp >= memsize)
-        {
-          result = *resultp;
-          memcpy (result, tmpbuf, length);
-        }
+        result = *resultp;
       else
         {
           char *memory;
 
           memory = (char *) malloc (memsize > 0 ? memsize : 1);
           if (memory != NULL)
-            {
-              memcpy (memory, tmpbuf, length);
-              result = memory;
-            }
+            result = memory;
           else
             {
               errno = ENOMEM;
               return -1;
             }
         }
+      memcpy (result, tmpbuf, length);
     }
   else if (result != *resultp && length + extra_alloc < allocated)
     {