X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-striconv.c;h=f39f142f3ebf298f62b07d188d6cdb06bea4e868;hb=07c1f7b3d60a2d8433bddf1a85c33bc2ba4f59ff;hp=8fb662c808f2ea6584f07a65f2dc584bf07f0a89;hpb=61d6ec62790ce03addf075dff18c0aacca1915f0;p=gnulib.git
diff --git a/tests/test-striconv.c b/tests/test-striconv.c
index 8fb662c80..f39f142f3 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-2008 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 . */
/* Written by Bruno Haible , 2007. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "striconv.h"
@@ -28,10 +25,21 @@
#endif
#include
+#include
#include
#include
-#define ASSERT(expr) if (!(expr)) abort ();
+#define ASSERT(expr) \
+ do \
+ { \
+ if (!(expr)) \
+ { \
+ fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+ fflush (stderr); \
+ abort (); \
+ } \
+ } \
+ while (0)
int
main ()
@@ -95,8 +103,7 @@ main ()
&result, &length);
ASSERT (retval == 0);
ASSERT (length == 0);
- if (result != NULL)
- free (result);
+ free (result);
}
/* ------------------------- Test str_cd_iconv() ------------------------- */