diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-10-13 11:12:28 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2014-10-13 11:12:28 -0700 |
| commit | 53544380266a8eb38bef9389562fba3ed58a0d11 (patch) | |
| tree | d040f7c483990e8cf4bb8e11102f15c04a2f6514 /time/strptime_l.c | |
| parent | fcb32af153a745414b0d949e707c9485ab77d6ba (diff) | |
| download | glibc-roland/Wshadow.tar glibc-roland/Wshadow.tar.gz glibc-roland/Wshadow.tar.bz2 glibc-roland/Wshadow.zip | |
Diffstat (limited to 'time/strptime_l.c')
| -rw-r--r-- | time/strptime_l.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/time/strptime_l.c b/time/strptime_l.c index b3a612e03c..94ca22129e 100644 --- a/time/strptime_l.c +++ b/time/strptime_l.c @@ -792,12 +792,12 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM) /* Match locale's alternate date and time format. */ if (s.decided != raw) { - const char *fmt = _NL_CURRENT (LC_TIME, ERA_D_T_FMT); + const char *subfmt = _NL_CURRENT (LC_TIME, ERA_D_T_FMT); - if (*fmt == '\0') - fmt = _NL_CURRENT (LC_TIME, D_T_FMT); + if (*subfmt == '\0') + subfmt = _NL_CURRENT (LC_TIME, D_T_FMT); - if (!recursive (fmt)) + if (!recursive (subfmt)) { if (s.decided == loc) return NULL; @@ -806,7 +806,7 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM) } else { - if (strcmp (fmt, HERE_D_T_FMT)) + if (strcmp (subfmt, HERE_D_T_FMT)) s.decided = loc; s.want_xday = 1; break; @@ -956,12 +956,12 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM) case 'x': if (s.decided != raw) { - const char *fmt = _NL_CURRENT (LC_TIME, ERA_D_FMT); + const char *subfmt = _NL_CURRENT (LC_TIME, ERA_D_FMT); - if (*fmt == '\0') - fmt = _NL_CURRENT (LC_TIME, D_FMT); + if (*subfmt == '\0') + subfmt = _NL_CURRENT (LC_TIME, D_FMT); - if (!recursive (fmt)) + if (!recursive (subfmt)) { if (s.decided == loc) return NULL; @@ -970,7 +970,7 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM) } else { - if (strcmp (fmt, HERE_D_FMT)) + if (strcmp (subfmt, HERE_D_FMT)) s.decided = loc; break; } @@ -982,12 +982,12 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM) case 'X': if (s.decided != raw) { - const char *fmt = _NL_CURRENT (LC_TIME, ERA_T_FMT); + const char *subfmt = _NL_CURRENT (LC_TIME, ERA_T_FMT); - if (*fmt == '\0') - fmt = _NL_CURRENT (LC_TIME, T_FMT); + if (*subfmt == '\0') + subfmt = _NL_CURRENT (LC_TIME, T_FMT); - if (!recursive (fmt)) + if (!recursive (subfmt)) { if (s.decided == loc) return NULL; @@ -996,7 +996,7 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM) } else { - if (strcmp (fmt, HERE_T_FMT)) + if (strcmp (subfmt, HERE_T_FMT)) s.decided = loc; break; } |