projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* doc/gnulib-readme.texi (Portability guidelines): ctype.h, not ctime.h.
[gnulib.git]
/
lib
/
strptime.c
diff --git
a/lib/strptime.c
b/lib/strptime.c
index
a09c80d
..
bcd219d
100644
(file)
--- a/
lib/strptime.c
+++ b/
lib/strptime.c
@@
-13,8
+13,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ with this program; if not, see <http://www.gnu.org/licenses/>. */
#ifndef _LIBC
# include <config.h>
#ifndef _LIBC
# include <config.h>
@@
-240,7
+239,6
@@
__strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM)
struct locale_data *const current = locale->__locales[LC_TIME];
#endif
struct locale_data *const current = locale->__locales[LC_TIME];
#endif
- const char *rp_backup;
int cnt;
size_t val;
int have_I, is_pm;
int cnt;
size_t val;
int have_I, is_pm;
@@
-253,14
+251,14
@@
__strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM)
int week_no;
#ifdef _NL_CURRENT
size_t num_eras;
int week_no;
#ifdef _NL_CURRENT
size_t num_eras;
+ struct era_entry *era = NULL;
+ const char *rp_backup;
#endif
#endif
- struct era_entry *era;
have_I = is_pm = 0;
century = -1;
want_century = 0;
want_era = 0;
have_I = is_pm = 0;
century = -1;
want_century = 0;
want_era = 0;
- era = NULL;
week_no = 0;
have_wday = want_xday = have_yday = have_mon = have_mday = have_uweek = 0;
week_no = 0;
have_wday = want_xday = have_yday = have_mon = have_mday = have_uweek = 0;
@@
-290,10
+288,10
@@
__strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM)
#ifndef _NL_CURRENT
/* We need this for handling the 'E' modifier. */
start_over:
#ifndef _NL_CURRENT
/* We need this for handling the 'E' modifier. */
start_over:
-#endif
-
+#else
/* Make back up of current processing pointer. */
rp_backup = rp;
/* Make back up of current processing pointer. */
rp_backup = rp;
+#endif
switch (*fmt++)
{
switch (*fmt++)
{
@@
-675,7
+673,7
@@
__strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM)
specify hours. If fours digits are used, minutes are
also specified. */
{
specify hours. If fours digits are used, minutes are
also specified. */
{
- bool neg;
+ bool neg
_GL_UNUSED
;
int n;
val = 0;
int n;
val = 0;