summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2012-06-13 21:55:42 +0200
committerBjörn Jacke <bj@sernet.de>2012-06-13 21:55:42 +0200
commit6a3b3fa3b079072d6a4bc399e3e410a9bd09b42b (patch)
tree64c54efb7eac53813b1243e3c1523f212b89a169
parent43c56dc4255a7a6cbd176e6ae66a7652c6d72d2c (diff)
downloadsamba-6a3b3fa3b079072d6a4bc399e3e410a9bd09b42b.tar.gz
samba-6a3b3fa3b079072d6a4bc399e3e410a9bd09b42b.tar.bz2
samba-6a3b3fa3b079072d6a4bc399e3e410a9bd09b42b.zip
Revert "replace: fix unused variable warning"
This reverts commit e2747fc62c2acbab143c4971469e0a4fc36d8789. one line slipped into a wrong ifndef ...
-rw-r--r--lib/replace/strptime.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/replace/strptime.c b/lib/replace/strptime.c
index 181fd12ba9..0e40f7561a 100644
--- a/lib/replace/strptime.c
+++ b/lib/replace/strptime.c
@@ -251,6 +251,7 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
enum locale_status *decided;
int era_cnt;
{
+ const char *rp_backup;
int cnt;
size_t val;
int have_I, is_pm;
@@ -260,17 +261,15 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
int have_yday;
int have_mon, have_mday;
#ifdef _NL_CURRENT
- const char *rp_backup;
size_t num_eras;
- struct era_entry *era;
-
- era = NULL;
#endif
+ struct era_entry *era;
have_I = is_pm = 0;
century = -1;
want_century = 0;
want_era = 0;
+ era = NULL;
have_wday = want_xday = have_yday = have_mon = have_mday = 0;
@@ -298,10 +297,10 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
#ifndef _NL_CURRENT
/* We need this for handling the `E' modifier. */
start_over:
+#endif
/* Make back up of current processing pointer. */
rp_backup = rp;
-#endif
switch (*fmt++)
{