From 2f6d1f1be920d156768f7fa17957c782c770ed36 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 25 Feb 1997 05:18:05 +0000 Subject: update from main archive 970225 1997-02-24 23:05 Wolfram Gloger * malloc/malloc.c (malloc_get_state): New function. Saves global malloc state to an opaque data structure which is dynamically allocated in the heap. * malloc/malloc.c (malloc_set_state): New function. Restore previously obtained state. * malloc/malloc.h: Add declaration of malloc_get_state() and malloc_set_state(). 1997-02-24 23:27 Ulrich Drepper * sysdeps/libm-ieee754/s_cbrtl.c: Shift B1_EXP value to right position. 1997-02-24 17:38 Ulrich Drepper * misc/error.c: Make error and error_at_line weak aliases of __error and __error_at_line respectively. Suggested by David Mosberger-Tang . * sysdeps/unix/sysv/linux/i386/socket.S: Update copyright. 1997-02-22 11:30 Andreas Schwab * elf/ldd.bash.in: Run the program directly, not as argument to the dynamic linker, if it contains an interpreter segment. * elf/ldd.sh.in: Likewise. * elf/rtld.c (dl_main): In verify mode check whether the dynamic object contains an interpreter segment and exit with 2 if not. 1997-02-23 01:23 Andreas Schwab * Makefile (distribute): Remove nsswitch.h, netgroup.h, mcheck.h and xlocale.h. Make-dist adds them automagically. 1997-02-22 12:25 Andreas Schwab * locale/C-time.c (_nl_C_LC_TIME): Add missing entry for time-era-num-entries. 1997-02-06 13:49 Andreas Schwab * rellns-sh: No need to check for existance of first parameter. 1997-02-24 15:20 Jonathan T. Agnew * glibcbug.in: Don't mention destination on MAIL_AGENT command line to avoid duplicate mail. 1997-02-24 03:51 Ulrich Drepper * Makefile (distribute): Add isomac.c. (tests): Run isomac test. * features.h (__USE_ISOC9X): New macro. * catgets/catgets.c: Don't use global variable `optind'. Instead use result computed by argp_parse. * db/makedb: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * libio/stdio.h: Rewrite. Make it more readable and add comments. * libio/clearerr.c: Remove clearerr_locked alias. * libio/feof.c: Remove feof_locked alias. * libio/ferror.c: Remove feof_locked alias. * libio/fileno.c: Remove fileno_locked alias. * libio/fputc.c: Remove fputc_locked alias. * libio/getc.c: Remove getc_locked alias. * libio/getchar.c: Remove getchar_locked alias. * libio/iofflush.c: Remove fflush_locked alias. * libio/putc.c: Remove putc_locked alias. * libio/putc.c: Remove putchar_locked alias. * stdio-common/printf_fp.c: When number is inifinity print INF or inf depending on case of specifier. Same for NaN where NAN or nan is printed. Specified in ISO C 9X. * misc/sys/cdefs.h (__restrict): Define to empty string for now. * stdio/stdio.h: Add __restrict to prototypes where necessary. * libio/stdio.h: Likewise. * stdlib/stdlib.h: Likewise. * string/string.h: Likewise. * time/time.h: Likewise. * wcsmbs/wchar.h: Likewise. * stdlib/strtod.c: Change to recognize INF, INFINITY, NAN, and NAN(...). * sysdeps/ieee754/huge_val.h: Define HUGE_VALF and HUGE_VALL instead of HUGE_VALf and HUGE_VALL. * stdlib/strtof.c (FLOAT_HUGE_VAL): Use standard name HUGE_VALF instead of HUGE_VALf. * wcsmbs/wcstof.c: Likewise. * stdlib/strtold.c (FLOAT_HUGE_VAL): Use standard name HUGE_VALL instead of HUGE_VALl. * wcsmbs/wcstold.c: Likewise. * sysdeps/posix/gai_strerror.c: Use size_t for counter variable to avoid warning. * wcsmbs/Makefile (routines): Add wcscasecmp and wcsncase. * wcsmbs/wchar.h: Add prototypes for wcscasecmp and wcsncase. * wcsmbs/wcscasecmp.c: New file. * wcsmbs/wcsncase.c: New file. * stdlib/strtol.c: Define wide character quad word functions as wcstoll and wcstoull and normal versions as strtoll and strtoull. * wcsmbs/wchar.h: Add prototypes for wcstoll and wcstoull. * wcsmbs/wcstoq: Renamed to wcstoll.c. * wcsmbs/wcstouq: Renamed to wcstoull.c. * wcsmbs/wcstoll.c: Renamed from wcstoq.c. Make wcstoq a weak alias of wcstoll. * wcsmbs/wcstoull.c: Renamed from wcstouq.c. Make wcstouq a weak alias of wcstoull. * wcsmbs/Makefile (routines): Replace wcstoq and wcstouq by wcstoll and wcstoull respectively. * stdlib/strtoq.c: Rename to strtoll.c. * stdlib/strtouq.c: Rename to strtoull.c. * stdlib/strtoll.c: Renamed from strtoq.c. Make strtoq a weak alias of strtoll. * stdlib/strtoll.c: Renamed from strtouq.c. Make strtouq a weak alias of strtoull. * stdlib/Makefile (routines): Replace strtoq and strtouq by strtoll and strtoull respectively. * stdio-common/vfscanf.c: Don't use __strtoq_internal and __strtouq_internal but instead __strtoll_internal and __strtoull_internal respectively. * stdlib/stdlib.h (strtoq): Use __internal_strtoll in inline version. (strtouq): Similar with __internal_strtoull. * wcsmbs/wchar.h (wcstoq): Use __internal_wcstoll in inline version. (wcstouq): Similar with __internal_wcstoull. 1997-02-23 04:38 Ulrich Drepper * stdlib/strtol.c (STRTOL): It is not illegal to parse a minus sign in the strtouXX functions. The results gets simply negated. * stdio-common/tstscanf.c: Add testcase for above case. * stdlib/tst-strtol.c: Correct tests. * manual/stdio-fp.c: New file. Generate output for example program in stdio.texi. * stdio-common/Makefile (routines): Add printf_fphex. * stdio-common/vfprintf.c: Add handling of %a and %A specifier. * stdio-common/printf_fphex.c: New file. Implement %a and %A specifier. 1997-02-22 03:01 Ulrich Drepper * sysdeps/unix/sysv/linux/timebits.h (CLK_TCK): Don't defined if __STRICT_ANSI__. * math/math.h: Prevent definition of struct exception when using C++. 1997-02-22 01:45 Ulrich Drepper * sysdeps/unix/syscalls.list: Dup takes only one argument. Reported by Greg McGary. 1997-02-21 00:22 Miles Bader 1997-02-20 01:28 Miles Bader 1997-02-19 13:56 Miles Bader 1997-02-18 15:39 Miles Bader 1997-02-17 10:58 Miles Bader 1997-02-15 10:23 Miles Bader (mutex_lock, mutex_unlock, mutex_trylock): Defined in terms of __mutex_*. (mutex_t): Type removed & replaced by new macro. (tsd_key_t): Typedef to int instead of pthread_key_t. (tsd_key_create, tsd_setspecific, tsd_getspecific): New macros. (__pthread_initialize): New macro, work around assumption of pthreads. * sysdeps/mach/hurd/i386/init-first.c (__libc_argv, __libc_argc): __hurd_sigthread_stack_end, __hurd_sigthread_stack_variables, __hurd_threadvar_max, __hurd_threadvar_stack_offset, __hurd_threadvar_stack_mask): Variables removed. 1997-02-14 14:07 Miles Bader * hurd/hurd.h (_hurd_pids_changed_stamp, _hurd_pids_changed_sync): 1997-02-24 17:06 Geoffrey Keating * sysdeps/unix/sysv/linux/accept.S (NARGS): Describe number of arguments taken, for sysdeps/unix/sysv/linux/powerpc/socket.S. * sysdeps/unix/sysv/linux/bind.S: Likewise. * sysdeps/unix/sysv/linux/connect.S: Likewise. * sysdeps/unix/sysv/linux/getpeername.S: Likewise. * sysdeps/unix/sysv/linux/getsockname.S: Likewise. * sysdeps/unix/sysv/linux/getsockopt.S: Likewise. * sysdeps/unix/sysv/linux/listen.S: Likewise. * sysdeps/unix/sysv/linux/recv.S: Likewise. * sysdeps/unix/sysv/linux/recvfrom.S: Likewise. * sysdeps/unix/sysv/linux/recvmsg.S: Likewise. * sysdeps/unix/sysv/linux/send.S: Likewise. * sysdeps/unix/sysv/linux/sendmsg.S: Likewise. * sysdeps/unix/sysv/linux/sendto.S: Likewise. * sysdeps/unix/sysv/linux/setsockopt.S: Likewise. * sysdeps/unix/sysv/linux/shutdown.S: Likewise. * sysdeps/unix/sysv/linux/socketpair.S: Likewise. 1997-02-15 04:51 Ulrich Drepper --- stdio/stdio.h | 69 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 35 deletions(-) (limited to 'stdio') diff --git a/stdio/stdio.h b/stdio/stdio.h index bd2ffa8..b2d0644 100644 --- a/stdio/stdio.h +++ b/stdio/stdio.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 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 @@ -307,7 +307,7 @@ extern char *tmpnam_r __P ((char *__s)); #endif -#if defined(__USE_SVID) || defined(__USE_XOPEN) +#if defined __USE_SVID || defined __USE_XOPEN /* Generate a unique temporary filename using up to five characters of PFX if it is not NULL. The directory to put this file in is searched for as follows: First the environment variable "TMPDIR" is checked. @@ -339,8 +339,9 @@ extern int fcloseall __P ((void)); /* Open a file and create a new stream for it. */ extern FILE *fopen __P ((__const char *__filename, __const char *__modes)); /* Open a file, replacing an existing stream with it. */ -extern FILE *freopen __P ((__const char *__filename, - __const char *__modes, FILE *__stream)); +extern FILE *freopen __P ((__const char *__restrict __filename, + __const char *__rstrict __modes, + FILE *__restrict __stream)); /* Return a new, zeroed, stream. You must set its cookie and io_mode. @@ -376,11 +377,11 @@ extern FILE *open_memstream __P ((char **__bufloc, size_t *__sizeloc)); /* If BUF is NULL, make STREAM unbuffered. Else make it use buffer BUF, of size BUFSIZ. */ -extern void setbuf __P ((FILE *__stream, char *__buf)); +extern void setbuf __P ((FILE *__restrict __stream, char *__restrict __buf)); /* Make STREAM use buffering mode MODE. If BUF is not NULL, use N bytes of it for buffering; else allocate an internal buffer N bytes long. */ -extern int setvbuf __P ((FILE *__stream, char *__buf, +extern int setvbuf __P ((FILE *__restrict __stream, char *__restrict __buf, int __modes, size_t __n)); #ifdef __USE_BSD @@ -394,24 +395,29 @@ extern void setlinebuf __P ((FILE *__stream)); /* Write formatted output to STREAM. */ -extern int fprintf __P ((FILE *__stream, __const char *__format, ...)); +extern int fprintf __P ((FILE *__restrict __stream, + __const char *__restrict __format, ...)); /* Write formatted output to stdout. */ -extern int printf __P ((__const char *__format, ...)); +extern int printf __P ((__const char *__restrict __format, ...)); /* Write formatted output to S. */ -extern int sprintf __P ((char *__s, __const char *__format, ...)); +extern int sprintf __P ((char *__restrict __s, + __const char *__restrict __format, ...)); /* Write formatted output to S from argument list ARG. */ -extern int vfprintf __P ((FILE *__s, __const char *__format, +extern int vfprintf __P ((FILE *__restrict __s, + __const char *__restrict __format, __gnuc_va_list __arg)); /* Write formatted output to stdout from argument list ARG. */ -extern int vprintf __P ((__const char *__format, __gnuc_va_list __arg)); +extern int vprintf __P ((__const char *__restrict __format, + __gnuc_va_list __arg)); /* Write formatted output to S from argument list ARG. */ -extern int vsprintf __P ((char *__s, __const char *__format, +extern int vsprintf __P ((char *__restrict __s, + __const char *__restrict __format, __gnuc_va_list __arg)); #ifdef __OPTIMIZE__ extern __inline int -vprintf (const char *__fmt, __gnuc_va_list __arg) +vprintf (const char *__restrict __fmt, __gnuc_va_list __arg) { return vfprintf (stdout, __fmt, __arg); } @@ -443,11 +449,13 @@ extern int dprintf __P ((int __fd, __const char *__fmt, ...)); /* Read formatted input from STREAM. */ -extern int fscanf __P ((FILE *__stream, __const char *__format, ...)); +extern int fscanf __P ((FILE *__restrict __stream, + __const char *__restrict __format, ...)); /* Read formatted input from stdin. */ -extern int scanf __P ((__const char *__format, ...)); +extern int scanf __P ((__const char *__restrict __format, ...)); /* Read formatted input from S. */ -extern int sscanf __P ((__const char *__s, __const char *__format, ...)); +extern int sscanf __P ((__const char *__restrict __s, + __const char *__restrict __format, ...)); #ifdef __USE_GNU /* Read formatted input from S into argument list ARG. */ @@ -556,7 +564,8 @@ extern int putw __P ((int __w, FILE *__stream)); /* Get a newline-terminated string of finite length from STREAM. */ -extern char *fgets __P ((char *__s, int __n, FILE *__stream)); +extern char *fgets __P ((char *__restrict __s, int __n, + FILE *__restrict __stream)); /* Get a newline-terminated string from stdin, removing the newline. DO NOT USE THIS FUNCTION!! There is no limit on how much it will read. */ @@ -582,27 +591,17 @@ ssize_t getline __P ((char **__lineptr, size_t *__n, FILE *__stream)); #ifdef __OPTIMIZE__ extern __inline ssize_t -__getline (char **__lineptr, size_t *__n, FILE *__stream) -{ - return __getdelim (__lineptr, __n, '\n', __stream); -} - -extern __inline ssize_t -getdelim (char **__lineptr, size_t *__n, int __delimiter, FILE *__stream) -{ - return __getdelim (__lineptr, __n, __delimiter, __stream); -} -extern __inline ssize_t getline (char **__lineptr, size_t *__n, FILE *__stream) { - return __getline (__lineptr, __n, __stream); + return __getdelim (__lineptr, __n, '\n', __stream); } #endif /* Optimizing. */ #endif /* Write a string to STREAM. */ -extern int fputs __P ((__const char *__s, FILE *__stream)); +extern int fputs __P ((__const char *__restrict __s, + FILE *__restrict __stream)); /* Write a string, followed by a newline, to stdout. */ extern int puts __P ((__const char *__s)); @@ -612,11 +611,11 @@ extern int ungetc __P ((int __c, FILE *__stream)); /* Read chunks of generic data from STREAM. */ -extern size_t fread __P ((__ptr_t __ptr, size_t __size, - size_t __n, FILE *__stream)); +extern size_t fread __P ((__ptr_t __restrict __ptr, size_t __size, + size_t __n, FILE *__restrict __stream)); /* Write chunks of generic data to STREAM. */ -extern size_t fwrite __P ((__const __ptr_t __ptr, size_t __size, - size_t __n, FILE *__s)); +extern size_t fwrite __P ((__const __ptr_t __restrict __ptr, size_t __size, + size_t __n, FILE *__restrict __s)); /* Seek to a certain position on STREAM. */ @@ -627,7 +626,7 @@ extern long int ftell __P ((FILE *__stream)); extern void rewind __P ((FILE *__stream)); /* Get STREAM's position. */ -extern int fgetpos __P ((FILE *__stream, fpos_t *__pos)); +extern int fgetpos __P ((FILE *__restrict __stream, fpos_t *__restrict __pos)); /* Set STREAM's position. */ extern int fsetpos __P ((FILE *__stream, __const fpos_t *__pos)); -- cgit v1.1