diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-11-16 12:02:08 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-11-16 12:02:08 +0000 |
| commit | 8b7fb5883bf50ab866f785b9cb36c8167f7a3286 (patch) | |
| tree | 4f4b8ccad0fec4529b7876a9a5c646f9b28691d1 /libio | |
| parent | be1d9d95b122ee20f8217e9263e088dec652543a (diff) | |
| download | glibc-8b7fb5883bf50ab866f785b9cb36c8167f7a3286.tar.gz glibc-8b7fb5883bf50ab866f785b9cb36c8167f7a3286.tar.xz glibc-8b7fb5883bf50ab866f785b9cb36c8167f7a3286.zip | |
Update.
1998-11-16 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/opendir.c: Use o_directory_works differently. Treat zero value as uninitialized so that variable can go into .bss. * dirent/opendir-tst1.c: Print error strings to stdout. * sysdeps/unix/sysv/linux/mmap64.c: New file. Empty. * sysdeps/unix/sysv/linux/syscalls.list: Add mmap with mmap64 alias. * sysdeps/unix/sysv/linux/arm/mmap.S: Add mmap64 alias. * sysdeps/unix/sysv/linux/i386/mmap.S: Likewise. * sysdeps/unix/sysv/linux/m68k/mmap.S: Likewise. 1998-11-16 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * time/tzfile.c (__tzfile_read): Check that types[i].isdst is in range. 1998-11-16 Ulrich Drepper <drepper@cygnus.com> * libio/bits/stdio.h (fread_unlocked): Do handle zero size and number. (fwrite_unlocked): Likewise. 1998-11-16 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * libio/bits/stdio.h (fread_unlocked): Don't evaluate non-constant twice. Don't bother handling zero size. (frwite_unlocked): Likewise. 1998-11-15 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * configure.in: Fix regex for makeinfo version string. 1998-11-15 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * sunrpc/rpc_sample.c (write_sample_server): Avoid -Wparentheses warning. * sunrpc/rpc_svcout.c (write_program): Likewise. 1998-11-15 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * time/Makefile (CFLAGS-test_time.c): Add -Wno-format. 1998-11-16 Ulrich Drepper <drepper@cygnus.com * misc/sys/mman.h: Pretty print prototypes. 1998-11-15 Ulrich Drepper <drepper@cygnus.com * misc/error.c (error): Don't use result of strerror_r call directly since at least DEC Unix has a wrong return type. Patch by Johan Danielsson <joda@pdc.kth.se>. 1998-11-16 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/bits/stdio.h | 53 |
1 files changed, 23 insertions, 30 deletions
diff --git a/libio/bits/stdio.h b/libio/bits/stdio.h index a3e3d6fc8d..8a15c6e6a6 100644 --- a/libio/bits/stdio.h +++ b/libio/bits/stdio.h @@ -127,48 +127,41 @@ ferror_unlocked (FILE *__stream) __THROW #if defined __USE_MISC && defined __GNUC__ && defined __OPTIMIZE__ /* Perform some simple optimizations. */ # define fread_unlocked(ptr, size, n, stream) \ - (__extension__ ((((__builtin_constant_p (size) \ - && ((size) == 0 || __builtin_constant_p (n))) \ - || (__builtin_constant_p (n) && (n) == 0)) \ - && (size_t) ((size) * (n)) <= 8) \ + (__extension__ ((__builtin_constant_p (size) && __builtin_constant_p (n) \ + && (size_t) ((size) * (n)) <= 8 && (size) != 0) \ ? ({ char *__ptr = (char *) (ptr); \ FILE *__stream = (stream); \ - size_t __size = (size); \ - size_t __n = (n); \ - size_t __readres = __n; \ - size_t __cnt = __size * __n + 1; \ - while (--__cnt > 0) \ + size_t __cnt; \ + for (__cnt = (size) * (n); __cnt > 0; --__cnt) \ { \ int __c = _IO_getc_unlocked (__stream); \ if (__c == EOF) \ - { \ - __readres = (__size * __n - __cnt) / __size; \ - break; \ - } \ + break; \ *__ptr++ = __c; \ } \ - __readres; }) \ - : fread_unlocked (ptr, size, n, stream))) + ((size_t) ((size) * (n)) - __cnt) / (size); }) \ + : (((__builtin_constant_p (size) && (size) == 0) \ + || (__builtin_constant_p (n) && (n) == 0)) \ + /* Evaluate all parameters once. */ \ + ? ((void) (ptr), (void) (stream), (void) (size), \ + (void) n, 0) \ + : fread_unlocked (ptr, size, n, stream)))) # define fwrite_unlocked(ptr, size, n, stream) \ - (__extension__ ((((__builtin_constant_p (size) \ - && ((size) == 0 || __builtin_constant_p (n))) \ - || (__builtin_constant_p (n) && (n) == 0)) \ - && (size_t) ((size) * (n)) <= 8) \ + (__extension__ ((__builtin_constant_p (size) && __builtin_constant_p (n) \ + && (size_t) ((size) * (n)) <= 8 && (size) != 0) \ ? ({ const char *__ptr = (const char *) (ptr); \ FILE *__stream = (stream); \ - size_t __size = (size); \ - size_t __n = (n); \ - size_t __writeres = __n; \ - size_t __cnt = __size * __n + 1; \ - while (--__cnt > 0) \ + size_t __cnt; \ + for (__cnt = (size) * (n); __cnt > 0; --__cnt) \ if (_IO_putc_unlocked (*__ptr++, __stream) == EOF) \ - { \ - __writeres = (__size * __n - __cnt) / __size; \ - break; \ - } \ - __writeres; }) \ - : fwrite_unlocked (ptr, size, n, stream))) + break; \ + ((size_t) ((size) * (n)) - __cnt) / (size); }) \ + : (((__builtin_constant_p (size) && (size) == 0) \ + || (__builtin_constant_p (n) && (n) == 0)) \ + /* Evaluate all parameters once. */ \ + ? ((void) (ptr), (void) (stream), (void) (size), n) \ + : fwrite_unlocked (ptr, size, n, stream)))) #endif /* Define helper macro. */ |