X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=tests%2Ftest-c-strstr.c;h=2bd0cf0d47bbb80021fed673c3a8d7a4ba9ec093;hb=77041ebc885b2af4e2d48fd49cf5529759351076;hp=dff500bda4db4f8b9b24ed169b299bc1333e4cf9;hpb=5a000062d2c3521f34793f9e987c68e0b5591c21;p=gnulib.git
diff --git a/tests/test-c-strstr.c b/tests/test-c-strstr.c
index dff500bda..2bd0cf0d4 100644
--- a/tests/test-c-strstr.c
+++ b/tests/test-c-strstr.c
@@ -1,10 +1,10 @@
/* Test of searching in a string.
- 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,20 +12,29 @@
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 "c-strstr.h"
+#include
#include
-
-#define ASSERT(expr) if (!(expr)) abort ();
+#include
+
+#define ASSERT(expr) \
+ do \
+ { \
+ if (!(expr)) \
+ { \
+ fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+ fflush (stderr); \
+ abort (); \
+ } \
+ } \
+ while (0)
int
main ()
@@ -121,10 +130,8 @@ main ()
result = c_strstr (haystack, needle);
ASSERT (result == haystack + m);
}
- if (needle != NULL)
- free (needle);
- if (haystack != NULL)
- free (haystack);
+ free (needle);
+ free (haystack);
}
return 0;