Mercurial > gnulib

changeset 30148:becd46ae0eeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove useless ASSERTs.
author Bruno Haible <bruno@clisp.org>
date Sun, 21 Sep 2008 16:43:46 +0200
parents 2d8e9a72916b
children 0cf6e1d053fa
files ChangeLog tests/test-snprintf-posix.h tests/test-sprintf-posix.h
diffstat 3 files changed, 5 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Sep 21 14:54:54 2008 +0200
+++ b/ChangeLog	Sun Sep 21 16:43:46 2008 +0200
@@ -1,3 +1,8 @@
+2008-09-21  Bruno Haible  <bruno@clisp.org>
+
+	* tests/test-snprintf-posix.h (test_function): Remove useless ASSERTs.
+	* tests/test-sprintf-posix.h (test_function): Likewise.
+
 2008-09-21  Bruno Haible  <bruno@clisp.org>
 
 	* modules/getpass (Depends-on): Add strdup-posix.
--- a/tests/test-snprintf-posix.h	Sun Sep 21 14:54:54 2008 +0200
+++ b/tests/test-snprintf-posix.h	Sun Sep 21 16:43:46 2008 +0200
@@ -927,7 +927,6 @@
     char result[100];
     int retval =
       my_snprintf (result, sizeof (result), "%10f %d", 1.75, 33, 44, 55);
-    ASSERT (result != NULL);
     ASSERT (strcmp (result, "  1.750000 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -936,7 +935,6 @@
     char result[100];
     int retval =
       my_snprintf (result, sizeof (result), "%-10f %d", 1.75, 33, 44, 55);
-    ASSERT (result != NULL);
     ASSERT (strcmp (result, "1.750000   33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -945,7 +943,6 @@
     char result[100];
     int retval =
       my_snprintf (result, sizeof (result), "%+f %d", 1.75, 33, 44, 55);
-    ASSERT (result != NULL);
     ASSERT (strcmp (result, "+1.750000 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -954,7 +951,6 @@
     char result[100];
     int retval =
       my_snprintf (result, sizeof (result), "% f %d", 1.75, 33, 44, 55);
-    ASSERT (result != NULL);
     ASSERT (strcmp (result, " 1.750000 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -963,7 +959,6 @@
     char result[100];
     int retval =
       my_snprintf (result, sizeof (result), "%#f %d", 1.75, 33, 44, 55);
-    ASSERT (result != NULL);
     ASSERT (strcmp (result, "1.750000 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -972,7 +967,6 @@
     char result[100];
     int retval =
       my_snprintf (result, sizeof (result), "%#.f %d", 1.75, 33, 44, 55);
-    ASSERT (result != NULL);
     ASSERT (strcmp (result, "2. 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1277,7 +1271,6 @@
     char result[100];
     int retval =
       my_snprintf (result, sizeof (result), "%10Lf %d", 1.75L, 33, 44, 55);
-    ASSERT (result != NULL);
     ASSERT (strcmp (result, "  1.750000 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1286,7 +1279,6 @@
     char result[100];
     int retval =
       my_snprintf (result, sizeof (result), "%-10Lf %d", 1.75L, 33, 44, 55);
-    ASSERT (result != NULL);
     ASSERT (strcmp (result, "1.750000   33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1295,7 +1287,6 @@
     char result[100];
     int retval =
       my_snprintf (result, sizeof (result), "%+Lf %d", 1.75L, 33, 44, 55);
-    ASSERT (result != NULL);
     ASSERT (strcmp (result, "+1.750000 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1304,7 +1295,6 @@
     char result[100];
     int retval =
       my_snprintf (result, sizeof (result), "% Lf %d", 1.75L, 33, 44, 55);
-    ASSERT (result != NULL);
     ASSERT (strcmp (result, " 1.750000 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1313,7 +1303,6 @@
     char result[100];
     int retval =
       my_snprintf (result, sizeof (result), "%#Lf %d", 1.75L, 33, 44, 55);
-    ASSERT (result != NULL);
     ASSERT (strcmp (result, "1.750000 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1322,7 +1311,6 @@
     char result[100];
     int retval =
       my_snprintf (result, sizeof (result), "%#.Lf %d", 1.75L, 33, 44, 55);
-    ASSERT (result != NULL);
     ASSERT (strcmp (result, "2. 33") == 0);
     ASSERT (retval == strlen (result));
   }
@@ -1705,7 +1693,6 @@
 	int retval =
 	  my_snprintf (result, sizeof (result), "%e", data[k].value);
 	const char *expected = data[k].string;
-	ASSERT (result != NULL);
 	ASSERT (strcmp (result, expected) == 0
 		/* Some implementations produce exponents with 3 digits.  */
 		|| (strlen (result) == strlen (expected) + 1
@@ -2940,7 +2927,6 @@
     int retval =
       my_snprintf (result, sizeof (result), "%.4000d %d", 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     for (i = 0; i < 4000 - 7; i++)
       ASSERT (result[i] == '0');
     ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0);
@@ -2952,7 +2938,6 @@
     int retval =
       my_snprintf (result, sizeof (result), "%.*d %d", 4000, 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     for (i = 0; i < 4000 - 7; i++)
       ASSERT (result[i] == '0');
     ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0);
@@ -2964,7 +2949,6 @@
     int retval =
       my_snprintf (result, sizeof (result), "%.4000d %d", -1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     ASSERT (result[0] == '-');
     for (i = 0; i < 4000 - 7; i++)
       ASSERT (result[1 + i] == '0');
@@ -2977,7 +2961,6 @@
     int retval =
       my_snprintf (result, sizeof (result), "%.4000u %d", 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     for (i = 0; i < 4000 - 7; i++)
       ASSERT (result[i] == '0');
     ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0);
@@ -2989,7 +2972,6 @@
     int retval =
       my_snprintf (result, sizeof (result), "%.4000o %d", 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     for (i = 0; i < 4000 - 7; i++)
       ASSERT (result[i] == '0');
     ASSERT (strcmp (result + 4000 - 7, "4553207 99") == 0);
@@ -3001,7 +2983,6 @@
     int retval =
       my_snprintf (result, sizeof (result), "%.4000x %d", 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     for (i = 0; i < 4000 - 6; i++)
       ASSERT (result[i] == '0');
     ASSERT (strcmp (result + 4000 - 6, "12d687 99") == 0);
@@ -3013,7 +2994,6 @@
     int retval =
       my_snprintf (result, sizeof (result), "%#.4000x %d", 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     ASSERT (result[0] == '0');
     ASSERT (result[1] == 'x');
     for (i = 0; i < 4000 - 6; i++)
@@ -3032,7 +3012,6 @@
       input[i] = 'a' + ((1000000 / (i + 1)) % 26);
     input[i] = '\0';
     retval = my_snprintf (result, sizeof (result), "%.4000s %d", input, 99);
-    ASSERT (result != NULL);
     ASSERT (memcmp (result, input, 4000) == 0);
     ASSERT (strcmp (result + 4000, " 99") == 0);
     ASSERT (retval == strlen (result));
--- a/tests/test-sprintf-posix.h	Sun Sep 21 14:54:54 2008 +0200
+++ b/tests/test-sprintf-posix.h	Sun Sep 21 16:43:46 2008 +0200
@@ -1679,7 +1679,6 @@
 	int retval =
 	  my_sprintf (result, "%e", data[k].value);
 	const char *expected = data[k].string;
-	ASSERT (result != NULL);
 	ASSERT (strcmp (result, expected) == 0
 		/* Some implementations produce exponents with 3 digits.  */
 		|| (strlen (result) == strlen (expected) + 1
@@ -2914,7 +2913,6 @@
     int retval =
       my_sprintf (result, "%.4000d %d", 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     for (i = 0; i < 4000 - 7; i++)
       ASSERT (result[i] == '0');
     ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0);
@@ -2926,7 +2924,6 @@
     int retval =
       my_sprintf (result, "%.*d %d", 4000, 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     for (i = 0; i < 4000 - 7; i++)
       ASSERT (result[i] == '0');
     ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0);
@@ -2938,7 +2935,6 @@
     int retval =
       my_sprintf (result, "%.4000d %d", -1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     ASSERT (result[0] == '-');
     for (i = 0; i < 4000 - 7; i++)
       ASSERT (result[1 + i] == '0');
@@ -2951,7 +2947,6 @@
     int retval =
       my_sprintf (result, "%.4000u %d", 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     for (i = 0; i < 4000 - 7; i++)
       ASSERT (result[i] == '0');
     ASSERT (strcmp (result + 4000 - 7, "1234567 99") == 0);
@@ -2963,7 +2958,6 @@
     int retval =
       my_sprintf (result, "%.4000o %d", 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     for (i = 0; i < 4000 - 7; i++)
       ASSERT (result[i] == '0');
     ASSERT (strcmp (result + 4000 - 7, "4553207 99") == 0);
@@ -2975,7 +2969,6 @@
     int retval =
       my_sprintf (result, "%.4000x %d", 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     for (i = 0; i < 4000 - 6; i++)
       ASSERT (result[i] == '0');
     ASSERT (strcmp (result + 4000 - 6, "12d687 99") == 0);
@@ -2987,7 +2980,6 @@
     int retval =
       my_sprintf (result, "%#.4000x %d", 1234567, 99);
     size_t i;
-    ASSERT (result != NULL);
     ASSERT (result[0] == '0');
     ASSERT (result[1] == 'x');
     for (i = 0; i < 4000 - 6; i++)
@@ -3006,7 +2998,6 @@
       input[i] = 'a' + ((1000000 / (i + 1)) % 26);
     input[i] = '\0';
     retval = my_sprintf (result, "%.4000s %d", input, 99);
-    ASSERT (result != NULL);
     ASSERT (memcmp (result, input, 4000) == 0);
     ASSERT (strcmp (result + 4000, " 99") == 0);
     ASSERT (retval == strlen (result));