diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-04-15 05:35:10 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-04-15 05:35:10 +0000 |
| commit | fab656f5a776f09596b9e74f9a43f8300dd724c7 (patch) | |
| tree | 61d7caeba4f8543fe115b6055a8a91edc55d6df8 /assert | |
| parent | 08f600749ecfeedfcd70c4dd8d0a9fa6c4380a1c (diff) | |
| download | glibc-fab656f5a776f09596b9e74f9a43f8300dd724c7.tar.gz | |
Update.
* include/sys/stat.h: Add prototypes for __lxstat_internal and
__lxstat64_internal. Add macros __lxstat and __lxstat64 if not
NOT_IN_libc.
* sysdeps/generic/lxstat.c: Use INTDEF for __lxstat.
* sysdeps/mach/hurd/lxstat.c: Likewise.
* sysdeps/unix/common/lxstat.c: Likewise.
* sysdeps/unix/sysv/aix/lxstat.c: Likewise.
* sysdeps/unix/sysv/linux/lxstat.c: Likewise.
* sysdeps/unix/sysv/linux/i386/lxstat.c: Likewise.
* sysdeps/unix/sysv/linux/ia64/lxstat.c: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c: Likewise.
* sysdeps/generic/lxstat64.c: Use INTDEF for __lxstat64.
* sysdeps/mach/hurd/lxstat64.c: Likewise.
* sysdeps/unix/sysv/aix/lxstat64.c: Likewise.
* sysdeps/unix/sysv/linuxx/lxstat64.c: Likewise.
* include/wchar.h: Declare __mbrtowc_internal and __mbrlen_internal
prototypes. Add __mbrlen and __mbrtowc macros.
* wcsmbs/mbrlen.c: Use INTDEF for __mbrlen.
* wcsmbs/mbrtowc.c: Use INTDEF for __mbrtowc.
* include/unistd.h: Add prototype for __write_internal and add
__libc_write macro is SHARED.
* sysdeps/generic/write.c: Use INTDEF for __write.
* sysdeps/mach/hurd/write.c: Likewise.
* sysdeps/unix/sysv/aix/write.c: Likewise.
* sysdeps/unix/syscalls.list: Add __libc_write alias.
* assert/assert.c: Replace STR_N_SIZE with something usable in
macro arguments.
* assert/assert-perr.c: Likewise.
Diffstat (limited to 'assert')
| -rw-r--r-- | assert/assert-perr.c | 8 | ||||
| -rw-r--r-- | assert/assert.c | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/assert/assert-perr.c b/assert/assert-perr.c index 3846529a53..1144530640 100644 --- a/assert/assert-perr.c +++ b/assert/assert-perr.c @@ -75,9 +75,11 @@ __assert_perror_fail (int errnum, free (buf); } else - /* At least print a minimal message. */ -#define STR_N_LEN(str) str, sizeof (str) - 1 - __libc_write (STDERR_FILENO, STR_N_LEN ("Unexpected error.\n")); + { + /* At least print a minimal message. */ + static const char errstr[] = "Unexpected error.\n"; + __libc_write (STDERR_FILENO, errstr, sizeof (errstr) - 1); + } abort (); } diff --git a/assert/assert.c b/assert/assert.c index 453d2af8a3..4f8fbfb130 100644 --- a/assert/assert.c +++ b/assert/assert.c @@ -73,9 +73,11 @@ __assert_fail (const char *assertion, const char *file, unsigned int line, free (buf); } else - /* At least print a minimal message. */ -#define STR_N_LEN(str) str, sizeof (str) - 1 - __libc_write (STDERR_FILENO, STR_N_LEN ("Unexpected error.\n")); + { + /* At least print a minimal message. */ + static const char errstr[] = "Unexpected error.\n"; + __libc_write (STDERR_FILENO, errstr, sizeof (errstr) - 1); + } abort (); } |