From 674d0dd44bd45d5ccda733a0f0e2b3f764095b84 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 21 Sep 2008 16:43:46 +0200 Subject: [PATCH] Remove useless ASSERTs. --- ChangeLog | 5 +++++ tests/test-snprintf-posix.h | 21 --------------------- tests/test-sprintf-posix.h | 9 --------- 3 files changed, 5 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70dee6f8a..4cf837803 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-09-21 Bruno Haible + * tests/test-snprintf-posix.h (test_function): Remove useless ASSERTs. + * tests/test-sprintf-posix.h (test_function): Likewise. + +2008-09-21 Bruno Haible + * modules/getpass (Depends-on): Add strdup-posix. New module 'strdup-posix'. diff --git a/tests/test-snprintf-posix.h b/tests/test-snprintf-posix.h index 43329300b..5bc4f8bdb 100644 --- a/tests/test-snprintf-posix.h +++ b/tests/test-snprintf-posix.h @@ -927,7 +927,6 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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 @@ test_function (int (*my_snprintf) (char *, size_t, const char *, ...)) 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)); diff --git a/tests/test-sprintf-posix.h b/tests/test-sprintf-posix.h index 7767c89bc..e491b1658 100644 --- a/tests/test-sprintf-posix.h +++ b/tests/test-sprintf-posix.h @@ -1679,7 +1679,6 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) 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 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) 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 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) 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 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) 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 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) 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 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) 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 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) 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 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) 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 @@ test_function (int (*my_sprintf) (char *, const char *, ...)) 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)); -- 2.11.0