summaryrefslogtreecommitdiff
path: root/include/stdio.h
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-11-18 06:17:03 -0500
committerMike Frysinger <vapier@gentoo.org>2012-11-18 06:17:03 -0500
commit290e19f8147d9b3c0166d3520e718ae5603e4cef (patch)
tree3c77d58f8cd8115b861809560e644699341c14ee /include/stdio.h
parent266bdc1f623fe6fe489e5115e0f8ef723705d949 (diff)
drop support for pre ISO-C compilers
This drops __signed, __volatile, and __const. Only the latter was used in the code base, and for uClibc, not consistently. Much of the code used plain "const" which meant "__const" was useless. Really, the point of this is to stay in sync with what glibc did. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'include/stdio.h')
-rw-r--r--include/stdio.h108
1 files changed, 54 insertions, 54 deletions
diff --git a/include/stdio.h b/include/stdio.h
index 9d54468b8..381ca5f02 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -141,16 +141,16 @@ extern FILE *stderr; /* Standard error output stream. */
__BEGIN_NAMESPACE_STD
/* Remove file FILENAME. */
-extern int remove (__const char *__filename) __THROW;
+extern int remove (const char *__filename) __THROW;
libc_hidden_proto(remove)
/* Rename file OLD to NEW. */
-extern int rename (__const char *__old, __const char *__new) __THROW;
+extern int rename (const char *__old, const char *__new) __THROW;
__END_NAMESPACE_STD
#ifdef __USE_ATFILE
/* Rename file OLD relative to OLDFD to NEW relative to NEWFD. */
-extern int renameat (int __oldfd, __const char *__old, int __newfd,
- __const char *__new) __THROW;
+extern int renameat (int __oldfd, const char *__old, int __newfd,
+ const char *__new) __THROW;
#endif
__BEGIN_NAMESPACE_STD
@@ -193,7 +193,7 @@ extern char *tmpnam_r (char *__s) __THROW __wur;
If not and if DIR is not NULL, that value is checked. If that fails,
P_tmpdir is tried and finally "/tmp". The storage for the filename
is allocated by `malloc'. */
-extern char *tempnam (__const char *__dir, __const char *__pfx)
+extern char *tempnam (const char *__dir, const char *__pfx)
__THROW __attribute_malloc__ __wur;
#endif
@@ -241,23 +241,23 @@ __BEGIN_NAMESPACE_STD
This function is a possible cancellation point and therefore not
marked with __THROW. */
-extern FILE *fopen (__const char *__restrict __filename,
- __const char *__restrict __modes) __wur;
+extern FILE *fopen (const char *__restrict __filename,
+ const char *__restrict __modes) __wur;
libc_hidden_proto(fopen)
/* Open a file, replacing an existing stream with it.
This function is a possible cancellation point and therefore not
marked with __THROW. */
-extern FILE *freopen (__const char *__restrict __filename,
- __const char *__restrict __modes,
+extern FILE *freopen (const char *__restrict __filename,
+ const char *__restrict __modes,
FILE *__restrict __stream) __wur;
#else
# ifdef __REDIRECT
-extern FILE *__REDIRECT (fopen, (__const char *__restrict __filename,
- __const char *__restrict __modes), fopen64)
+extern FILE *__REDIRECT (fopen, (const char *__restrict __filename,
+ const char *__restrict __modes), fopen64)
__wur;
-extern FILE *__REDIRECT (freopen, (__const char *__restrict __filename,
- __const char *__restrict __modes,
+extern FILE *__REDIRECT (freopen, (const char *__restrict __filename,
+ const char *__restrict __modes,
FILE *__restrict __stream), freopen64)
__wur;
# else
@@ -267,17 +267,17 @@ extern FILE *__REDIRECT (freopen, (__const char *__restrict __filename,
#endif
__END_NAMESPACE_STD
#ifdef __USE_LARGEFILE64
-extern FILE *fopen64 (__const char *__restrict __filename,
- __const char *__restrict __modes) __wur;
+extern FILE *fopen64 (const char *__restrict __filename,
+ const char *__restrict __modes) __wur;
libc_hidden_proto(fopen64)
-extern FILE *freopen64 (__const char *__restrict __filename,
- __const char *__restrict __modes,
+extern FILE *freopen64 (const char *__restrict __filename,
+ const char *__restrict __modes,
FILE *__restrict __stream) __wur;
#endif
#ifdef __USE_POSIX
/* Create a new stream that refers to an existing system file descriptor. */
-extern FILE *fdopen (int __fd, __const char *__modes) __THROW __wur;
+extern FILE *fdopen (int __fd, const char *__modes) __THROW __wur;
libc_hidden_proto(fdopen)
#endif
@@ -286,14 +286,14 @@ libc_hidden_proto(fdopen)
/* Create a new stream that refers to the given magic cookie,
and uses the given functions for input and output. */
extern FILE *fopencookie (void *__restrict __magic_cookie,
- __const char *__restrict __modes,
+ const char *__restrict __modes,
_IO_cookie_io_functions_t __io_funcs) __THROW __wur;
libc_hidden_proto(fopencookie)
#endif
#ifdef __USE_XOPEN2K8
/* Create a new stream that refers to a memory buffer. */
-extern FILE *fmemopen (void *__s, size_t __len, __const char *__modes)
+extern FILE *fmemopen (void *__s, size_t __len, const char *__modes)
__THROW __wur;
/* Open a stream that writes into a malloc'd buffer that is expanded as
@@ -334,17 +334,17 @@ __BEGIN_NAMESPACE_STD
This function is a possible cancellation point and therefore not
marked with __THROW. */
extern int fprintf (FILE *__restrict __stream,
- __const char *__restrict __format, ...);
+ const char *__restrict __format, ...);
libc_hidden_proto(fprintf)
/* Write formatted output to stdout.
This function is a possible cancellation point and therefore not
marked with __THROW. */
-extern int printf (__const char *__restrict __format, ...);
+extern int printf (const char *__restrict __format, ...);
libc_hidden_proto(printf)
/* Write formatted output to S. */
extern int sprintf (char *__restrict __s,
- __const char *__restrict __format, ...)
+ const char *__restrict __format, ...)
__THROW __attribute__ ((__format__ (__printf__, 2, 3)));
libc_hidden_proto(sprintf)
@@ -352,16 +352,16 @@ libc_hidden_proto(sprintf)
This function is a possible cancellation point and therefore not
marked with __THROW. */
-extern int vfprintf (FILE *__restrict __s, __const char *__restrict __format,
+extern int vfprintf (FILE *__restrict __s, const char *__restrict __format,
__gnuc_va_list __arg);
libc_hidden_proto(vfprintf)
/* Write formatted output to stdout from argument list ARG.
This function is a possible cancellation point and therefore not
marked with __THROW. */
-extern int vprintf (__const char *__restrict __format, __gnuc_va_list __arg);
+extern int vprintf (const char *__restrict __format, __gnuc_va_list __arg);
/* Write formatted output to S from argument list ARG. */
-extern int vsprintf (char *__restrict __s, __const char *__restrict __format,
+extern int vsprintf (char *__restrict __s, const char *__restrict __format,
__gnuc_va_list __arg)
__THROW __attribute__ ((__format__ (__printf__, 2, 0)));
__END_NAMESPACE_STD
@@ -370,12 +370,12 @@ __END_NAMESPACE_STD
__BEGIN_NAMESPACE_C99
/* Maximum chars of output to write in MAXLEN. */
extern int snprintf (char *__restrict __s, size_t __maxlen,
- __const char *__restrict __format, ...)
+ const char *__restrict __format, ...)
__THROW __attribute__ ((__format__ (__printf__, 3, 4)));
libc_hidden_proto(snprintf)
extern int vsnprintf (char *__restrict __s, size_t __maxlen,
- __const char *__restrict __format, __gnuc_va_list __arg)
+ const char *__restrict __format, __gnuc_va_list __arg)
__THROW __attribute__ ((__format__ (__printf__, 3, 0)));
libc_hidden_proto(vsnprintf)
__END_NAMESPACE_C99
@@ -384,17 +384,17 @@ __END_NAMESPACE_C99
#ifdef __USE_GNU
/* Write formatted output to a string dynamically allocated with `malloc'.
Store the address of the string in *PTR. */
-extern int vasprintf (char **__restrict __ptr, __const char *__restrict __f,
+extern int vasprintf (char **__restrict __ptr, const char *__restrict __f,
__gnuc_va_list __arg)
__THROW __attribute__ ((__format__ (__printf__, 2, 0))) __wur;
libc_hidden_proto(vasprintf)
#if 0 /* uClibc: disabled */
extern int __asprintf (char **__restrict __ptr,
- __const char *__restrict __fmt, ...)
+ const char *__restrict __fmt, ...)
__THROW __attribute__ ((__format__ (__printf__, 2, 3))) __wur;
#endif
extern int asprintf (char **__restrict __ptr,
- __const char *__restrict __fmt, ...)
+ const char *__restrict __fmt, ...)
__THROW __attribute__ ((__format__ (__printf__, 2, 3))) __wur;
libc_hidden_proto(asprintf)
#endif
@@ -406,11 +406,11 @@ libc_hidden_proto(asprintf)
cancellation point. But due to similarity with an POSIX interface
or due to the implementation they are cancellation points and
therefore not marked with __THROW. */
-extern int vdprintf (int __fd, __const char *__restrict __fmt,
+extern int vdprintf (int __fd, const char *__restrict __fmt,
__gnuc_va_list __arg)
__attribute__ ((__format__ (__printf__, 2, 0)));
libc_hidden_proto(vdprintf)
-extern int dprintf (int __fd, __const char *__restrict __fmt, ...)
+extern int dprintf (int __fd, const char *__restrict __fmt, ...)
__attribute__ ((__format__ (__printf__, 2, 3)));
#endif
@@ -421,18 +421,18 @@ __BEGIN_NAMESPACE_STD
This function is a possible cancellation point and therefore not
marked with __THROW. */
extern int fscanf (FILE *__restrict __stream,
- __const char *__restrict __format, ...)
+ const char *__restrict __format, ...)
__attribute__ ((__format__ (__scanf__, 2, 3))) __wur;
libc_hidden_proto(fscanf)
/* Read formatted input from stdin.
This function is a possible cancellation point and therefore not
marked with __THROW. */
-extern int scanf (__const char *__restrict __format, ...)
+extern int scanf (const char *__restrict __format, ...)
__attribute__ ((__format__ (__scanf__, 1, 2))) __wur;
/* Read formatted input from S. */
-extern int sscanf (__const char *__restrict __s,
- __const char *__restrict __format, ...)
+extern int sscanf (const char *__restrict __s,
+ const char *__restrict __format, ...)
__THROW __attribute__ ((__format__ (__scanf__, 2, 3)));
libc_hidden_proto(sscanf)
__END_NAMESPACE_STD
@@ -443,7 +443,7 @@ __BEGIN_NAMESPACE_C99
This function is a possible cancellation point and therefore not
marked with __THROW. */
-extern int vfscanf (FILE *__restrict __s, __const char *__restrict __format,
+extern int vfscanf (FILE *__restrict __s, const char *__restrict __format,
__gnuc_va_list __arg)
__attribute__ ((__format__ (__scanf__, 2, 0))) __wur;
libc_hidden_proto(vfscanf)
@@ -452,12 +452,12 @@ libc_hidden_proto(vfscanf)
This function is a possible cancellation point and therefore not
marked with __THROW. */
-extern int vscanf (__const char *__restrict __format, __gnuc_va_list __arg)
+extern int vscanf (const char *__restrict __format, __gnuc_va_list __arg)
__attribute__ ((__format__ (__scanf__, 1, 0))) __wur;
/* Read formatted input from S into argument list ARG. */
-extern int vsscanf (__const char *__restrict __s,
- __const char *__restrict __format, __gnuc_va_list __arg)
+extern int vsscanf (const char *__restrict __s,
+ const char *__restrict __format, __gnuc_va_list __arg)
__THROW __attribute__ ((__format__ (__scanf__, 2, 0)));
libc_hidden_proto(vsscanf)
__END_NAMESPACE_C99
@@ -629,14 +629,14 @@ __BEGIN_NAMESPACE_STD
This function is a possible cancellation points and therefore not
marked with __THROW. */
-extern int fputs (__const char *__restrict __s, FILE *__restrict __stream);
+extern int fputs (const char *__restrict __s, FILE *__restrict __stream);
libc_hidden_proto(fputs)
/* Write a string, followed by a newline, to stdout.
This function is a possible cancellation points and therefore not
marked with __THROW. */
-extern int puts (__const char *__s);
+extern int puts (const char *__s);
/* Push a character back onto the input buffer of STREAM.
@@ -658,7 +658,7 @@ libc_hidden_proto(fread)
This function is a possible cancellation points and therefore not
marked with __THROW. */
-extern size_t fwrite (__const void *__restrict __ptr, size_t __size,
+extern size_t fwrite (const void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __s) __wur;
libc_hidden_proto(fwrite)
__END_NAMESPACE_STD
@@ -670,7 +670,7 @@ __END_NAMESPACE_STD
cancellation point. But due to similarity with an POSIX interface
or due to the implementation it is a cancellation point and
therefore not marked with __THROW. */
-extern int fputs_unlocked (__const char *__restrict __s,
+extern int fputs_unlocked (const char *__restrict __s,
FILE *__restrict __stream);
libc_hidden_proto(fputs_unlocked)
#endif
@@ -685,7 +685,7 @@ libc_hidden_proto(fputs_unlocked)
extern size_t fread_unlocked (void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __stream) __wur;
libc_hidden_proto(fread_unlocked)
-extern size_t fwrite_unlocked (__const void *__restrict __ptr, size_t __size,
+extern size_t fwrite_unlocked (const void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __stream) __wur;
libc_hidden_proto(fwrite_unlocked)
#endif
@@ -753,13 +753,13 @@ extern int fgetpos (FILE *__restrict __stream, fpos_t *__restrict __pos);
This function is a possible cancellation point and therefore not
marked with __THROW. */
-extern int fsetpos (FILE *__stream, __const fpos_t *__pos);
+extern int fsetpos (FILE *__stream, const fpos_t *__pos);
#else
# ifdef __REDIRECT
extern int __REDIRECT (fgetpos, (FILE *__restrict __stream,
fpos_t *__restrict __pos), fgetpos64);
extern int __REDIRECT (fsetpos,
- (FILE *__stream, __const fpos_t *__pos), fsetpos64);
+ (FILE *__stream, const fpos_t *__pos), fsetpos64);
# else
# define fgetpos fgetpos64
# define fsetpos fsetpos64
@@ -773,7 +773,7 @@ libc_hidden_proto(fseeko64)
extern __off64_t ftello64 (FILE *__stream) __wur;
libc_hidden_proto(ftello64)
extern int fgetpos64 (FILE *__restrict __stream, fpos64_t *__restrict __pos);
-extern int fsetpos64 (FILE *__stream, __const fpos64_t *__pos);
+extern int fsetpos64 (FILE *__stream, const fpos64_t *__pos);
#endif
__BEGIN_NAMESPACE_STD
@@ -798,7 +798,7 @@ __BEGIN_NAMESPACE_STD
This function is a possible cancellation point and therefore not
marked with __THROW. */
-extern void perror (__const char *__s);
+extern void perror (const char *__s);
libc_hidden_proto(perror)
__END_NAMESPACE_STD
@@ -807,7 +807,7 @@ __END_NAMESPACE_STD
function provides all the needed functionality. */
#ifdef __USE_BSD
extern int sys_nerr;
-extern __const char *__const sys_errlist[];
+extern const char *const sys_errlist[];
#endif
#endif /* __UCLIBC_HAS_SYS_ERRLIST__ */
@@ -831,7 +831,7 @@ libc_hidden_proto(fileno_unlocked)
This function is a possible cancellation point and therefore not
marked with __THROW. */
-extern FILE *popen (__const char *__command, __const char *__modes) __wur;
+extern FILE *popen (const char *__command, const char *__modes) __wur;
/* Close a stream opened by popen and return the status of its child.
@@ -858,10 +858,10 @@ struct obstack; /* See <obstack.h>. */
/* Write formatted output to an obstack. */
extern int obstack_printf (struct obstack *__restrict __obstack,
- __const char *__restrict __format, ...)
+ const char *__restrict __format, ...)
__THROW __attribute__ ((__format__ (__printf__, 2, 3)));
extern int obstack_vprintf (struct obstack *__restrict __obstack,
- __const char *__restrict __format,
+ const char *__restrict __format,
__gnuc_va_list __args)
__THROW __attribute__ ((__format__ (__printf__, 2, 0)));
#endif /* Use GNU. */