about summary refs log tree commit diff
path: root/time/strptime.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-07-28 19:08:57 +0000
committerUlrich Drepper <drepper@redhat.com>2007-07-28 19:08:57 +0000
commitfa69dc9caf8fff3e7ebb6da6dbbe144b314277f4 (patch)
tree41f24eda2791e0b10f114fc1a8dcc70fa207df3e /time/strptime.c
parent7b503bcc1373670a4456ba8f4a5ccfce712347d1 (diff)
downloadglibc-fa69dc9caf8fff3e7ebb6da6dbbe144b314277f4.tar.gz
glibc-fa69dc9caf8fff3e7ebb6da6dbbe144b314277f4.tar.xz
glibc-fa69dc9caf8fff3e7ebb6da6dbbe144b314277f4.zip
* include/time.h (enum ptime_locale_status): Remove.
	(__strptime_internal): Remove decided and era_cnt arguments,
	add statep argument.
	* time/strptime_l.c (__strptime_internal): Remove decided
	and era_cnt arguments, add statep argument.  Don't recompute
	any fields in recursive calls, only update caller's tm
	and state, if recursive call fails, don't change tm nor
	any state.
	(get_alt_number): Adjust.
	(recursive): Adjust caller.
	(strptime): Likewise.
	* time/strptime.c (strptime): Likewise.
Diffstat (limited to 'time/strptime.c')
-rw-r--r--time/strptime.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/time/strptime.c b/time/strptime.c
index fc3526912d..18af49bbb3 100644
--- a/time/strptime.c
+++ b/time/strptime.c
@@ -1,5 +1,6 @@
 /* Convert a string representation of time to a time value.
-   Copyright (C) 1996-2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1996-2000, 2001, 2002, 2004, 2007
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -33,8 +34,6 @@ strptime (buf, format, tm)
      const char *format;
      struct tm *tm;
 {
-  enum ptime_locale_status decided = not;
-  return __strptime_internal (buf, format, tm, &decided, -1,
-			      _NL_CURRENT_LOCALE);
+  return __strptime_internal (buf, format, tm, NULL, _NL_CURRENT_LOCALE);
 }
 libc_hidden_def (strptime)