diff options
| author | Greg McGary <greg@mcgary.org> | 2000-07-29 08:11:47 +0000 |
|---|---|---|
| committer | Greg McGary <greg@mcgary.org> | 2000-07-29 08:11:47 +0000 |
| commit | 41d998a6830b3ee58bdde684a4f7908c320aad66 (patch) | |
| tree | ccf14ab4c678ef83f88475698ca60b34008c5fa7 /time/asctime.c | |
| parent | f2897624e20cfc8e89fc30c8e8e1619ebbc1aacf (diff) | |
| download | glibc-41d998a6830b3ee58bdde684a4f7908c320aad66.zip glibc-41d998a6830b3ee58bdde684a4f7908c320aad66.tar.gz glibc-41d998a6830b3ee58bdde684a4f7908c320aad66.tar.bz2 | |
Update.
2000-07-29 Greg McGary <greg@mcgary.org>
* Rules (test-bp-inputs, make-test-out): New variables.
($(objpfx)%-bp.out): New rule.
($(objpfx)%.out): Rewrite in terms of new variables.
* libio/iovswscanf.c (vswscanf): Pass _IO_FILE_plus pointer to
internal function that uses vtable.
* libio/vsnprintf.c (_IO_vsnprintf): Likewise.
* libio/vswprintf.c (_IO_vswprintf): Likewise.
* malloc/malloc.c (mem2chunk): Define in terms of chunk_at_offset.
(malloc_extend_top): Convert brk to chunk using chunk_at_offset.
(chunk_align): Likewise.
* time/asctime.c (ab_day_name, ab_month_name): Rewrite expression
in a way that conforms to decl, and avoids spurious bounds violation.
* sysdeps/arm/frame.h (struct layout): Make pointers __unbounded.
* sysdeps/generic/frame.h: Likewise.
* sysdeps/generic/backtrace.c (ADVANCE_STACK_FRAME): Wrap bounds
around return value.
(__backtrace): Qualify frame-pointer chain and return address
pointers as __unbounded. Wrap bounds around variable `current'.
* sysdeps/generic/segfault.c (ADVANCE_STACK_FRAME): Wrap bounds
around return value.
(catch_segfault): Qualify frame-pointer chain and return address
pointers as __unbounded. Wrap bounds around variable `current'.
* sysdeps/i386/backtrace.c (struct layout): Make pointers __unbounded.
(ADVANCE_STACK_FRAME): Wrap bounds around return value.
* sysdeps/powerpc/backtrace.c (struct layout): Make pointers __unbounded.
(__backtrace): Qualify frame-pointer chain and return address
pointers as __unbounded. Wrap bounds around variable `current'.
* sysdeps/i386/addmul_1.S: s2_limb is scalar so remove bounds check.
* sysdeps/i386/mul_1.S: Likewise.
* sysdeps/i386/submul_1.S: Likewise.
* sysdeps/i386/i586/addmul_1.S: Likewise.
* sysdeps/i386/i586/mul_1.S: Add bounds checks.
* sysdeps/i386/i586/submul_1.S: Likewise.
Diffstat (limited to 'time/asctime.c')
| -rw-r--r-- | time/asctime.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/time/asctime.c b/time/asctime.c index 730c6dc..9070b11 100644 --- a/time/asctime.c +++ b/time/asctime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1993, 1995, 1996, 1997, 2000 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 @@ -23,8 +23,8 @@ /* This is defined in locale/C-time.c in the GNU libc. */ extern const struct locale_data _nl_C_LC_TIME; -#define ab_day_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABDAY_1)].string) -#define ab_month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABMON_1)].string) +#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]; @@ -49,9 +49,9 @@ __asctime_r (const struct tm *tp, char *buf) if (sprintf (buf, format, (tp->tm_wday < 0 || tp->tm_wday >= 7 ? - "???" : ab_day_name[tp->tm_wday]), + "???" : ab_day_name (tp->tm_wday)), (tp->tm_mon < 0 || tp->tm_mon >= 12 ? - "???" : ab_month_name[tp->tm_mon]), + "???" : ab_month_name (tp->tm_mon)), tp->tm_mday, tp->tm_hour, tp->tm_min, tp->tm_sec, 1900 + tp->tm_year) < 0) return NULL; |