X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-striconv.c;h=20cdd710f0338a957585a916baa6193a92cd39fa;hb=aa4ddc348b91b7d8846e57c004f356a8b7b7da82;hp=fec7948c66bd5e9e76d4d416a1d845d45aae1612;hpb=bf551d174da1d1cdf212d63bbdbe7a8c174b8e50;p=gnulib.git

diff --git a/tests/test-striconv.c b/tests/test-striconv.c
index fec7948c6..20cdd710f 100644
--- a/tests/test-striconv.c
+++ b/tests/test-striconv.c
@@ -1,10 +1,10 @@
 /* Test of character set conversion.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2011 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,14 +12,11 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "striconv.h"
 
@@ -31,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) if (!(expr)) abort ();
+#include "macros.h"
 
 int
 main ()
@@ -52,9 +49,9 @@ main ()
     static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
     static const char expected[] = "\303\204rger mit b\303\266sen B\303\274bchen ohne Augenma\303\237";
     char *result = NULL;
-    size_t length;
+    size_t length = 0;
     int retval = mem_cd_iconv (input, strlen (input), cd_88591_to_utf8,
-			       &result, &length);
+                               &result, &length);
     ASSERT (retval == 0);
     ASSERT (length == strlen (expected));
     ASSERT (result != NULL && memcmp (result, expected, strlen (expected)) == 0);
@@ -66,9 +63,9 @@ main ()
     static const char input[] = "\303\204rger mit b\303\266sen B\303\274bchen ohne Augenma\303\237";
     static const char expected[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
     char *result = NULL;
-    size_t length;
+    size_t length = 0;
     int retval = mem_cd_iconv (input, strlen (input), cd_utf8_to_88591,
-			       &result, &length);
+                               &result, &length);
     ASSERT (retval == 0);
     ASSERT (length == strlen (expected));
     ASSERT (result != NULL && memcmp (result, expected, strlen (expected)) == 0);
@@ -79,9 +76,9 @@ main ()
   {
     static const char input[] = "\342\202\254"; /* EURO SIGN */
     char *result = NULL;
-    size_t length;
+    size_t length = 0;
     int retval = mem_cd_iconv (input, strlen (input), cd_utf8_to_88591,
-			       &result, &length);
+                               &result, &length);
     ASSERT (retval == -1 && errno == EILSEQ);
     ASSERT (result == NULL);
   }
@@ -90,13 +87,12 @@ main ()
   {
     static const char input[] = "\342";
     char *result = NULL;
-    size_t length;
+    size_t length = 0;
     int retval = mem_cd_iconv (input, strlen (input), cd_utf8_to_88591,
-			       &result, &length);
+                               &result, &length);
     ASSERT (retval == 0);
     ASSERT (length == 0);
-    if (result != NULL)
-      free (result);
+    free (result);
   }
 
   /* ------------------------- Test str_cd_iconv() ------------------------- */