aboutsummaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-10-25 08:23:00 +0000
committerUlrich Drepper <drepper@redhat.com>2000-10-25 08:23:00 +0000
commitb05598ef313e7c37c6a8f4cbf15966890f35a8df (patch)
tree657570ae1a8a5531ef9d1127f860f9cf64af8ea0 /time
parent7e036a01346eea3d1478a56684f69f441121a0a4 (diff)
downloadglibc-b05598ef313e7c37c6a8f4cbf15966890f35a8df.zip
glibc-b05598ef313e7c37c6a8f4cbf15966890f35a8df.tar.gz
glibc-b05598ef313e7c37c6a8f4cbf15966890f35a8df.tar.bz2
Update.
2000-10-24 Paul Eggert <eggert@twinsun.com> * time/strftime.c (my_strftime macro) [!defined _LIBC && HAVE_TZNAME && HAVE_TZSET]: When redefining, do it without args, so that it works even if emacs is defined and an extra argument is passed to my_stftime. (my_strftime function): When evaluating a subformat, pass ut_argument as well. 2000-10-24 Andreas Schwab <schwab@suse.de> * sysdeps/unix/sysv/linux/ia64/Versions: Add pciconfig_read and pciconfig_write. * sysdeps/generic/dl-cache.c (_dl_cache_verify_ptr): Correct test for files with new cache format. (_dl_load_cache_lookup): Add variable cache_data_size for size of the data. Correctly report error if neither old not new signature is found. Little optimizations. Mostly based on a patch by Denis Zaitsev <zzz@cd-club.ru>.
Diffstat (limited to 'time')
-rw-r--r--time/strftime.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/time/strftime.c b/time/strftime.c
index 95dbae1..f98fe21 100644
--- a/time/strftime.c
+++ b/time/strftime.c
@@ -455,8 +455,7 @@ static CHAR_T const month_name[][10] =
return _strftime_copytm (s, maxsize, format, &tmcopy ut_argument);
}
# undef my_strftime
-# define my_strftime(S, Maxsize, Format, Tp) \
- _strftime_copytm (S, Maxsize, Format, Tp)
+# define my_strftime _strftime_copytm
#endif
@@ -799,8 +798,10 @@ my_strftime (s, maxsize, format, tp ut_argument)
subformat:
{
CHAR_T *old_start = p;
- size_t len = my_strftime (NULL, (size_t) -1, subfmt, tp);
- add (len, my_strftime (p, maxsize - i, subfmt, tp));
+ size_t len = my_strftime (NULL, (size_t) -1, subfmt,
+ tp ut_argument);
+ add (len, my_strftime (p, maxsize - i, subfmt,
+ tp ut_argument));
if (to_uppcase)
while (old_start < p)