From 833861be818bb5d45ab0c47370b84068dfb2fedf Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 16 Feb 2005 12:31:10 +0000 Subject: import later fedora-branch tweaks --- time/strptime_l.c | 12 +++++------- time/tst-strptime.c | 22 ++-------------------- 2 files changed, 7 insertions(+), 27 deletions(-) (limited to 'time') diff --git a/time/strptime_l.c b/time/strptime_l.c index 01c4f8282a..df98099f0a 100644 --- a/time/strptime_l.c +++ b/time/strptime_l.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -539,12 +539,10 @@ __strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM) } #endif if (!match_string (HERE_AM_STR, rp)) - { - if (match_string (HERE_PM_STR, rp)) - is_pm = 1; - else - return NULL; - } + if (match_string (HERE_PM_STR, rp)) + is_pm = 1; + else + return NULL; break; case 'r': #ifdef _NL_CURRENT 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; -- cgit v1.2.3