about summary refs log tree commit diff
path: root/time/tst-strptime.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
committerUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
commita334319f6530564d22e775935d9c91663623a1b4 (patch)
treeb5877475619e4c938e98757d518bb1e9cbead751 /time/tst-strptime.c
parent0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (diff)
downloadglibc-a334319f6530564d22e775935d9c91663623a1b4.tar.gz
glibc-a334319f6530564d22e775935d9c91663623a1b4.tar.xz
glibc-a334319f6530564d22e775935d9c91663623a1b4.zip
(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.
Diffstat (limited to 'time/tst-strptime.c')
-rw-r--r--time/tst-strptime.c22
1 files changed, 2 insertions, 20 deletions
diff --git a/time/tst-strptime.c b/time/tst-strptime.c
index 6356aa0d41..a0b2ebedd2 100644
--- a/time/tst-strptime.c
+++ b/time/tst-strptime.c
@@ -42,10 +42,6 @@ static const struct
   { "C", "19990502123412", "%Y%m%d%H%M%S", 0, 121, 4, 2 },
   { "C", "2001 20 Mon", "%Y %U %a", 1, 140, 4, 21 },
   { "C", "2001 21 Mon", "%Y %W %a", 1, 140, 4, 21 },
-  { "ja_JP.EUC-JP", "2000-01-01 08:12:21 AM", "%Y-%m-%d %I:%M:%S %p",
-    6, 0, 0, 1 },
-  { "en_US.ISO-8859-1", "2000-01-01 08:12:21 PM", "%Y-%m-%d %I:%M:%S %p",
-    6, 0, 0, 1 },
   { "ja_JP.EUC-JP", "2001 20 \xb7\xee", "%Y %U %a", 1, 140, 4, 21 },
   { "ja_JP.EUC-JP", "2001 21 \xb7\xee", "%Y %W %a", 1, 140, 4, 21 },
 };
@@ -77,14 +73,7 @@ test_tm (void)
     {
       memset (&tm, '\0', sizeof (tm));
 
-      char *ret = strptime (tm_tests[i].input, tm_tests[i].format, &tm);
-      if (ret == NULL)
-	{
-	  printf ("strptime returned NULL for `%s'\n", tm_tests[i].input);
-	  result = 1;
-	  continue;
-	}
-      else if (*ret != '\0')
+      if (*strptime (tm_tests[i].input, tm_tests[i].format, &tm) != '\0')
 	{
 	  printf ("not all of `%s' read\n", tm_tests[i].input);
 	  result = 1;
@@ -138,14 +127,7 @@ main (int argc, char *argv[])
 	  exit (EXIT_FAILURE);
 	}
 
-      char *ret = strptime (day_tests[i].input, day_tests[i].format, &tm);
-      if (ret == NULL)
-	{
-	  printf ("strptime returned NULL for `%s'\n", day_tests[i].input);
-	  result = 1;
-	  continue;
-	}
-      else if (*ret != '\0')
+      if (*strptime (day_tests[i].input, day_tests[i].format, &tm) != '\0')
 	{
 	  printf ("not all of `%s' read\n", day_tests[i].input);
 	  result = 1;