X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-striconveha.c;h=47e9a46e0301a148a419c131fd2d779daf08c8de;hb=d5b641f5183e4e3d69a3e06f69bcf6ecee302a1b;hp=fab21c34fd28940a35b0018476ab128b5ab57533;hpb=c0fea97ccf33a4e6b6f9116216b1634663f29474;p=gnulib.git

diff --git a/tests/test-striconveha.c b/tests/test-striconveha.c
index fab21c34f..47e9a46e0 100644
--- a/tests/test-striconveha.c
+++ b/tests/test-striconveha.c
@@ -1,10 +1,10 @@
 /* Test of character set conversion with error handling and autodetection.
-   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,8 +12,7 @@
    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.  */
 
@@ -37,6 +36,7 @@
       if (!(expr))							     \
         {								     \
           fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          fflush (stderr);						     \
           abort ();							     \
         }								     \
     }									     \
@@ -314,8 +314,7 @@ main ()
 	      ASSERT (offsets[1] == MAGIC);
 	      free (offsets);
 	    }
-	  if (result != NULL)
-	    free (result);
+	  free (result);
 	}
     }