From f095bb7204d80f609a73a22796edd6cffd4c6add Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 9 Jan 2010 10:56:41 -0800 Subject: Add support for XPG7 testing. The header conformance testing code needed extending for XPG7. This exposed a few bugs in the headers. There are more changes to come. --- time/alt_digit.c | 10 +++++----- time/asctime.c | 6 +++--- time/era.c | 10 +++++----- time/lc-time-cleanup.c | 4 ++-- time/strftime_l.c | 4 ++-- time/strptime_l.c | 6 +++--- 6 files changed, 20 insertions(+), 20 deletions(-) (limited to 'time') diff --git a/time/alt_digit.c b/time/alt_digit.c index 95e4f07c73..9238911147 100644 --- a/time/alt_digit.c +++ b/time/alt_digit.c @@ -1,5 +1,5 @@ /* Helper functions used by strftime/strptime to handle alternate digits. - Copyright (C) 1995-2002, 2008 Free Software Foundation, Inc. + Copyright (C) 1995-2002, 2008, 2010 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 @@ -31,7 +31,7 @@ __libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden) ((wchar_t *) current->values[_NL_ITEM_INDEX (item)].wstr) static void -_nl_init_alt_digit (struct locale_data *current) +_nl_init_alt_digit (struct __locale_data *current) { struct lc_time_data *data; @@ -70,7 +70,7 @@ _nl_init_alt_digit (struct locale_data *current) const char * internal_function -_nl_get_alt_digit (unsigned int number, struct locale_data *current) +_nl_get_alt_digit (unsigned int number, struct __locale_data *current) { const char *result; @@ -96,7 +96,7 @@ _nl_get_alt_digit (unsigned int number, struct locale_data *current) const wchar_t * internal_function -_nl_get_walt_digit (unsigned int number, struct locale_data *current) +_nl_get_walt_digit (unsigned int number, struct __locale_data *current) { const wchar_t *result = NULL; struct lc_time_data *data; @@ -149,7 +149,7 @@ _nl_get_walt_digit (unsigned int number, struct locale_data *current) int internal_function -_nl_parse_alt_digit (const char **strp, struct locale_data *current) +_nl_parse_alt_digit (const char **strp, struct __locale_data *current) { const char *str = *strp; int result = -1; diff --git a/time/asctime.c b/time/asctime.c index dc4fd54f4e..8cf266a3ff 100644 --- a/time/asctime.c +++ b/time/asctime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,1993,1995-1997,2000,2002,2005 +/* Copyright (C) 1991,1993,1995-1997,2000,2002,2005,2010 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -24,12 +24,12 @@ #include /* This is defined in locale/C-time.c in the GNU libc. */ -extern const struct locale_data _nl_C_LC_TIME attribute_hidden; +extern const struct __locale_data _nl_C_LC_TIME attribute_hidden; #define ab_day_name(DAY) (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABDAY_1)+(DAY)].string) #define ab_month_name(MON) (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABMON_1)+(MON)].string) static const char format[] = "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n"; -static char result[ 3+1+ 3+1+20+1+20+1+20+1+20+1+20+1 + 1]; +static char result[ 3+1+ 3+1+20+1+20+1+20+1+20+1+20+1 + 1]; static char * diff --git a/time/era.c b/time/era.c index a6f4a4cb07..6630747cc3 100644 --- a/time/era.c +++ b/time/era.c @@ -1,5 +1,5 @@ /* Helper functions used by strftime/strptime to handle locale-specific "eras". - Copyright (C) 1995-2002, 2008 Free Software Foundation, Inc. + Copyright (C) 1995-2002, 2008, 2010 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 @@ -36,7 +36,7 @@ __libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden) /* Look up the era information in CURRENT's locale strings and cache it in CURRENT->private. */ static void internal_function -_nl_init_era_entries (struct locale_data *current) +_nl_init_era_entries (struct __locale_data *current) { size_t cnt; struct lc_time_data *data; @@ -83,7 +83,7 @@ _nl_init_era_entries (struct locale_data *current) data->num_eras = 0; data->eras = NULL; } - else + else { const char *ptr = CURRENT (_NL_TIME_ERA_ENTRIES); data->num_eras = new_num_eras; @@ -140,7 +140,7 @@ _nl_init_era_entries (struct locale_data *current) struct era_entry * internal_function -_nl_get_era_entry (const struct tm *tp, struct locale_data *current) +_nl_get_era_entry (const struct tm *tp, struct __locale_data *current) { if (current->private.time == NULL || !current->private.time->era_initialized) _nl_init_era_entries (current); @@ -167,7 +167,7 @@ _nl_get_era_entry (const struct tm *tp, struct locale_data *current) struct era_entry * internal_function -_nl_select_era_entry (int cnt, struct locale_data *current) +_nl_select_era_entry (int cnt, struct __locale_data *current) { if (current->private.time == NULL || !current->private.time->era_initialized) _nl_init_era_entries (current); diff --git a/time/lc-time-cleanup.c b/time/lc-time-cleanup.c index 6777f487a2..aa91e3eb2b 100644 --- a/time/lc-time-cleanup.c +++ b/time/lc-time-cleanup.c @@ -1,5 +1,5 @@ /* Cleanup code for data structures kept by strftime/strptime helper functions. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2010 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 @@ -21,7 +21,7 @@ #include void internal_function -_nl_cleanup_time (struct locale_data *locale) +_nl_cleanup_time (struct __locale_data *locale) { struct lc_time_data *const data = locale->private.time; if (data != NULL) diff --git a/time/strftime_l.c b/time/strftime_l.c index deb75c8e94..08c2aeb32b 100644 --- a/time/strftime_l.c +++ b/time/strftime_l.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2004, 2007, 2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2004, 2007-2009, 2010 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 @@ -502,7 +502,7 @@ __strftime_internal (s, maxsize, format, tp, tzset_called ut_argument LOCALE_PARAM_DECL { #if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL - struct locale_data *const current = loc->__locales[LC_TIME]; + struct __locale_data *const current = loc->__locales[LC_TIME]; #endif int hour12 = tp->tm_hour; diff --git a/time/strptime_l.c b/time/strptime_l.c index c4a0638fff..ccd2a90705 100644 --- a/time/strptime_l.c +++ b/time/strptime_l.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +/* Copyright (C) 2002,2004,2005,2007,2008,2010 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 @@ -119,7 +119,7 @@ localtime_r (t, tp) #ifdef _LIBC /* This is defined in locale/C-time.c in the GNU libc. */ -extern const struct locale_data _nl_C_LC_TIME attribute_hidden; +extern const struct __locale_data _nl_C_LC_TIME attribute_hidden; # define weekday_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (DAY_1)].string) # define ab_weekday_name \ @@ -249,7 +249,7 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM) LOCALE_PARAM_DECL { #ifdef _LIBC - struct locale_data *const current = locale->__locales[LC_TIME]; + struct __locale_data *const current = locale->__locales[LC_TIME]; #endif const char *rp_backup; -- cgit 1.4.1