diff options
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/fileops.c | 2 | ||||
| -rw-r--r-- | libio/genops.c | 3 | ||||
| -rw-r--r-- | libio/iofclose.c | 1 | ||||
| -rw-r--r-- | libio/iofdopen.c | 1 | ||||
| -rw-r--r-- | libio/iofgetpos.c | 2 | ||||
| -rw-r--r-- | libio/iofgetpos64.c | 2 | ||||
| -rw-r--r-- | libio/iofopen.c | 2 | ||||
| -rw-r--r-- | libio/iofopncook.c | 4 | ||||
| -rw-r--r-- | libio/iofsetpos.c | 2 | ||||
| -rw-r--r-- | libio/iofsetpos64.c | 2 | ||||
| -rw-r--r-- | libio/iolibio.h | 8 | ||||
| -rw-r--r-- | libio/iopopen.c | 1 | ||||
| -rw-r--r-- | libio/iosetvbuf.c | 3 | ||||
| -rw-r--r-- | libio/libio.h | 15 | ||||
| -rw-r--r-- | libio/libioP.h | 70 |
15 files changed, 69 insertions, 49 deletions
diff --git a/libio/fileops.c b/libio/fileops.c index c9c5cbc..f281104 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -396,6 +396,7 @@ _IO_new_file_setbuf (FILE *fp, char *p, ssize_t len) return fp; } +libc_hidden_def (_IO_new_file_setbuf) libc_hidden_ver (_IO_new_file_setbuf, _IO_file_setbuf) @@ -432,6 +433,7 @@ _IO_new_do_write (FILE *fp, const char *data, size_t to_do) return (to_do == 0 || (size_t) new_do_write (fp, data, to_do) == to_do) ? 0 : EOF; } +libc_hidden_def (_IO_new_do_write) libc_hidden_ver (_IO_new_do_write, _IO_do_write) static size_t diff --git a/libio/genops.c b/libio/genops.c index 2fec221..6a48ed7 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -108,9 +108,8 @@ libc_hidden_def (_IO_link_in) /* Return minimum _pos markers Assumes the current get area is the main get area. */ -ssize_t _IO_least_marker (FILE *fp, char *end_p); -ssize_t +static ssize_t _IO_least_marker (FILE *fp, char *end_p) { ssize_t least_so_far = end_p - fp->_IO_read_base; diff --git a/libio/iofclose.c b/libio/iofclose.c index 7a8b89f..259e318 100644 --- a/libio/iofclose.c +++ b/libio/iofclose.c @@ -79,6 +79,7 @@ _IO_new_fclose (FILE *fp) return status; } +libc_hidden_def (_IO_new_fclose) versioned_symbol (libc, _IO_new_fclose, _IO_fclose, GLIBC_2_1); strong_alias (_IO_new_fclose, __new_fclose) diff --git a/libio/iofdopen.c b/libio/iofdopen.c index 1f20eac..75d6c07 100644 --- a/libio/iofdopen.c +++ b/libio/iofdopen.c @@ -160,6 +160,7 @@ _IO_new_fdopen (int fd, const char *mode) } return &new_f->fp.file; } +libc_hidden_def (_IO_new_fdopen) libc_hidden_ver (_IO_new_fdopen, _IO_fdopen) strong_alias (_IO_new_fdopen, __new_fdopen) diff --git a/libio/iofgetpos.c b/libio/iofgetpos.c index 8177326..fc7a3c4 100644 --- a/libio/iofgetpos.c +++ b/libio/iofgetpos.c @@ -79,7 +79,7 @@ _IO_new_fgetpos (FILE *fp, __fpos_t *posp) _IO_release_lock (fp); return result; } - +libc_hidden_def (_IO_new_fgetpos) strong_alias (_IO_new_fgetpos, __new_fgetpos) versioned_symbol (libc, _IO_new_fgetpos, _IO_fgetpos, GLIBC_2_2); versioned_symbol (libc, __new_fgetpos, fgetpos, GLIBC_2_2); diff --git a/libio/iofgetpos64.c b/libio/iofgetpos64.c index 0ec5413..a552f2d 100644 --- a/libio/iofgetpos64.c +++ b/libio/iofgetpos64.c @@ -62,7 +62,7 @@ _IO_new_fgetpos64 (FILE *fp, __fpos64_t *posp) _IO_release_lock (fp); return result; } - +libc_hidden_def (_IO_new_fgetpos64) strong_alias (_IO_new_fgetpos64, __new_fgetpos64) versioned_symbol (libc, _IO_new_fgetpos64, _IO_fgetpos64, GLIBC_2_2); versioned_symbol (libc, __new_fgetpos64, fgetpos64, GLIBC_2_2); diff --git a/libio/iofopen.c b/libio/iofopen.c index ed3e8b8..d10849b 100644 --- a/libio/iofopen.c +++ b/libio/iofopen.c @@ -85,7 +85,7 @@ _IO_new_fopen (const char *filename, const char *mode) { return __fopen_internal (filename, mode, 1); } - +libc_hidden_def (_IO_new_fopen) strong_alias (_IO_new_fopen, __new_fopen) versioned_symbol (libc, _IO_new_fopen, _IO_fopen, GLIBC_2_1); versioned_symbol (libc, __new_fopen, fopen, GLIBC_2_1); diff --git a/libio/iofopncook.c b/libio/iofopncook.c index 43a87fe..7411737 100644 --- a/libio/iofopncook.c +++ b/libio/iofopncook.c @@ -147,7 +147,7 @@ set_callbacks (cookie_io_functions_t *target, *target = source; } -void +static void _IO_cookie_init (struct _IO_cookie_file *cfile, int read_write, void *cookie, cookie_io_functions_t io_functions) { @@ -213,7 +213,7 @@ _IO_fopencookie (void *cookie, const char *mode, return (FILE *) &new_f->cfile.__fp; } - +libc_hidden_def (_IO_fopencookie) versioned_symbol (libc, _IO_fopencookie, fopencookie, GLIBC_2_2); #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) diff --git a/libio/iofsetpos.c b/libio/iofsetpos.c index da48b27..23b04e4 100644 --- a/libio/iofsetpos.c +++ b/libio/iofsetpos.c @@ -66,7 +66,7 @@ _IO_new_fsetpos (FILE *fp, const __fpos_t *posp) _IO_release_lock (fp); return result; } - +libc_hidden_def (_IO_new_fsetpos) strong_alias (_IO_new_fsetpos, __new_fsetpos) versioned_symbol (libc, _IO_new_fsetpos, _IO_fsetpos, GLIBC_2_2); versioned_symbol (libc, __new_fsetpos, fsetpos, GLIBC_2_2); diff --git a/libio/iofsetpos64.c b/libio/iofsetpos64.c index 29da981..94b0bd7 100644 --- a/libio/iofsetpos64.c +++ b/libio/iofsetpos64.c @@ -56,7 +56,7 @@ _IO_new_fsetpos64 (FILE *fp, const fpos64_t *posp) _IO_release_lock (fp); return result; } - +libc_hidden_def (_IO_new_fsetpos64) strong_alias (_IO_new_fsetpos64, __new_fsetpos64) versioned_symbol (libc, __new_fsetpos64, fsetpos64, GLIBC_2_2); versioned_symbol (libc, _IO_new_fsetpos64, _IO_fsetpos64, GLIBC_2_2); diff --git a/libio/iolibio.h b/libio/iolibio.h index 69e1c0e..6b5b8cf 100644 --- a/libio/iolibio.h +++ b/libio/iolibio.h @@ -9,11 +9,13 @@ extern int _IO_fclose (FILE*); extern int _IO_new_fclose (FILE*); +libc_hidden_proto (_IO_new_fclose) extern int _IO_old_fclose (FILE*); extern FILE *_IO_fdopen (int, const char*) __THROW; libc_hidden_proto (_IO_fdopen) extern FILE *_IO_old_fdopen (int, const char*) __THROW; extern FILE *_IO_new_fdopen (int, const char*) __THROW; +libc_hidden_proto (_IO_new_fdopen) extern int _IO_fflush (FILE*); libc_hidden_proto (_IO_fflush) extern int _IO_fgetpos (FILE*, __fpos_t*); @@ -22,6 +24,7 @@ extern char* _IO_fgets (char*, int, FILE*); extern FILE *_IO_fopen (const char*, const char*); extern FILE *_IO_old_fopen (const char*, const char*); extern FILE *_IO_new_fopen (const char*, const char*); +libc_hidden_proto (_IO_new_fopen) extern FILE *_IO_fopen64 (const char*, const char*); extern FILE *__fopen_internal (const char*, const char*, int) attribute_hidden; @@ -49,7 +52,8 @@ libc_hidden_proto (_IO_setvbuf) extern int _IO_sscanf (const char*, const char*, ...) __THROW; extern int _IO_sprintf (char *, const char*, ...) __THROW; extern int _IO_ungetc (int, FILE*) __THROW; -extern int _IO_vsscanf (const char *, const char *, __gnuc_va_list) __THROW; +extern int _IO_vsscanf (const char *, const char *, __gnuc_va_list) + __THROW attribute_hidden; extern int _IO_vsprintf (char*, const char*, __gnuc_va_list) __THROW; libc_hidden_proto (_IO_vsprintf) extern int _IO_vswprintf (wchar_t*, size_t, const wchar_t*, __gnuc_va_list) @@ -57,7 +61,7 @@ extern int _IO_vswprintf (wchar_t*, size_t, const wchar_t*, __gnuc_va_list) struct obstack; extern int _IO_obstack_vprintf (struct obstack *, const char *, __gnuc_va_list) - __THROW; + __THROW attribute_hidden; extern int _IO_obstack_printf (struct obstack *, const char *, ...) __THROW; #define _IO_clearerr(FP) ((FP)->_flags &= ~(_IO_ERR_SEEN|_IO_EOF_SEEN)) #define _IO_fseek(__fp, __offset, __whence) \ diff --git a/libio/iopopen.c b/libio/iopopen.c index 2eff45b..82c1036 100644 --- a/libio/iopopen.c +++ b/libio/iopopen.c @@ -177,6 +177,7 @@ _IO_new_proc_open (FILE *fp, const char *command, const char *mode) _IO_mask_flags (fp, read_or_write, _IO_NO_READS|_IO_NO_WRITES); return fp; } +libc_hidden_def (_IO_new_proc_open) FILE * _IO_new_popen (const char *command, const char *mode) diff --git a/libio/iosetvbuf.c b/libio/iosetvbuf.c index a35d866..a92a24b 100644 --- a/libio/iosetvbuf.c +++ b/libio/iosetvbuf.c @@ -49,8 +49,7 @@ _IO_setvbuf (FILE *fp, char *buf, int mode, size_t size) buffering has not been explicitly set". In both cases, _IO_LINE_BUF is off. If this is a tty, and _IO_filedoalloc later gets called, it cannot know if - it should set the _IO_LINE_BUF flag (because that is - the default), or not (because we have explicitly asked + it should set the _IO_LINE_BUF flag (because that is the default), or not (because we have explicitly asked for fully buffered mode). So we make sure a buffer gets allocated now, and explicitly turn off line buffering. diff --git a/libio/libio.h b/libio/libio.h index 00f9169..ffd692e 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -193,10 +193,6 @@ extern FILE *_IO_stderr attribute_hidden; struct _IO_cookie_file; -/* Initialize one of those. */ -extern void _IO_cookie_init (struct _IO_cookie_file *__cfile, int __read_write, - void *__cookie, cookie_io_functions_t __fns); - extern int __underflow (FILE *); extern wint_t __wunderflow (FILE *); extern wint_t __wuflow (FILE *); @@ -269,7 +265,7 @@ extern void _IO_free_backup_area (FILE *) __THROW; extern wint_t _IO_getwc (FILE *__fp); extern wint_t _IO_putwc (wchar_t __wc, FILE *__fp); -extern int _IO_fwide (FILE *__fp, int __mode) __THROW; +extern int _IO_fwide (FILE *__fp, int __mode) __THROW attribute_hidden; #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) # define _IO_fwide_maybe_incompatible \ @@ -298,10 +294,13 @@ weak_extern (_IO_stdin_used); __result; }) extern int _IO_vfwscanf (FILE * __restrict, const wchar_t * __restrict, - __gnuc_va_list, int *__restrict); + __gnuc_va_list, int *__restrict) + attribute_hidden; extern int _IO_vfwprintf (FILE *__restrict, const wchar_t *__restrict, - __gnuc_va_list); -extern __ssize_t _IO_wpadn (FILE *, wint_t, __ssize_t); + __gnuc_va_list) + attribute_hidden; +extern __ssize_t _IO_wpadn (FILE *, wint_t, __ssize_t) + attribute_hidden; extern void _IO_free_wbackup_area (FILE *) __THROW; #ifdef __LDBL_COMPAT diff --git a/libio/libioP.h b/libio/libioP.h index 8afe703..9175b3c 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -343,6 +343,7 @@ struct _IO_cookie_file FILE *_IO_fopencookie (void *cookie, const char *mode, cookie_io_functions_t io_functions); +libc_hidden_proto (_IO_fopencookie) /* Iterator type for walking global linked list of _IO_FILE objects. */ @@ -351,8 +352,8 @@ typedef FILE *_IO_ITER; /* Generic functions */ -extern void _IO_switch_to_main_get_area (FILE *) __THROW; -extern void _IO_switch_to_backup_area (FILE *) __THROW; +extern void _IO_switch_to_main_get_area (FILE *) __THROW attribute_hidden; +extern void _IO_switch_to_backup_area (FILE *) __THROW attribute_hidden; extern int _IO_switch_to_get_mode (FILE *); libc_hidden_proto (_IO_switch_to_get_mode) extern void _IO_init_internal (FILE *, int) attribute_hidden; @@ -442,7 +443,7 @@ extern int _IO_default_pbackfail (FILE *, int) __THROW; libc_hidden_proto (_IO_default_pbackfail) extern wint_t _IO_wdefault_pbackfail (FILE *, wint_t) __THROW; libc_hidden_proto (_IO_wdefault_pbackfail) -extern FILE* _IO_default_setbuf (FILE *, char *, ssize_t); +extern FILE* _IO_default_setbuf (FILE *, char *, ssize_t) attribute_hidden; extern size_t _IO_default_xsputn (FILE *, const void *, size_t); libc_hidden_proto (_IO_default_xsputn) extern size_t _IO_wdefault_xsputn (FILE *, const void *, size_t); @@ -480,24 +481,29 @@ extern const struct _IO_codecvt __libio_codecvt attribute_hidden; extern int _IO_do_write (FILE *, const char *, size_t); libc_hidden_proto (_IO_do_write) extern int _IO_new_do_write (FILE *, const char *, size_t); +libc_hidden_proto (_IO_new_do_write) extern int _IO_old_do_write (FILE *, const char *, size_t); extern int _IO_wdo_write (FILE *, const wchar_t *, size_t); libc_hidden_proto (_IO_wdo_write) -extern int _IO_flush_all_lockp (int); +extern int _IO_flush_all_lockp (int) attribute_hidden; extern int _IO_flush_all (void); libc_hidden_proto (_IO_flush_all) -extern int _IO_cleanup (void); +extern int _IO_cleanup (void) attribute_hidden; extern void _IO_flush_all_linebuffered (void); libc_hidden_proto (_IO_flush_all_linebuffered) extern int _IO_new_fgetpos (FILE *, __fpos_t *); +libc_hidden_proto (_IO_new_fgetpos) extern int _IO_old_fgetpos (FILE *, __fpos_t *); extern int _IO_new_fsetpos (FILE *, const __fpos_t *); +libc_hidden_proto (_IO_new_fsetpos) extern int _IO_old_fsetpos (FILE *, const __fpos_t *); extern int _IO_new_fgetpos64 (FILE *, __fpos64_t *); +libc_hidden_proto (_IO_new_fgetpos64) extern int _IO_old_fgetpos64 (FILE *, __fpos64_t *); extern int _IO_new_fsetpos64 (FILE *, const __fpos64_t *); +libc_hidden_proto (_IO_new_fsetpos64) extern int _IO_old_fsetpos64 (FILE *, const __fpos64_t *); -extern void _IO_old_init (FILE *fp, int flags) __THROW; +extern void _IO_old_init (FILE *fp, int flags) __THROW attribute_hidden; #define _IO_do_flush(_f) \ @@ -554,8 +560,8 @@ libc_hidden_proto (_IO_file_close) extern int _IO_file_close_mmap (FILE *) __THROW; extern int _IO_file_underflow (FILE *); libc_hidden_proto (_IO_file_underflow) -extern int _IO_file_underflow_mmap (FILE *); -extern int _IO_file_underflow_maybe_mmap (FILE *); +extern int _IO_file_underflow_mmap (FILE *) attribute_hidden; +extern int _IO_file_underflow_maybe_mmap (FILE *) attribute_hidden; extern int _IO_file_overflow (FILE *, int); libc_hidden_proto (_IO_file_overflow) #define _IO_file_is_open(__fp) ((__fp)->_fileno != -1) @@ -583,10 +589,12 @@ extern void _IO_new_file_finish (FILE *, int); extern FILE* _IO_new_file_fopen (FILE *, const char *, const char *, int); extern void _IO_no_init (FILE *, int, int, struct _IO_wide_data *, - const struct _IO_jump_t *) __THROW; + const struct _IO_jump_t *) + __THROW attribute_hidden; extern void _IO_new_file_init_internal (struct _IO_FILE_plus *) __THROW attribute_hidden; extern FILE* _IO_new_file_setbuf (FILE *, char *, ssize_t); +libc_hidden_proto (_IO_new_file_setbuf) extern FILE* _IO_file_setbuf_mmap (FILE *, char *, ssize_t); extern int _IO_new_file_sync (FILE *); extern int _IO_new_file_underflow (FILE *); @@ -623,10 +631,10 @@ extern off64_t _IO_wfile_seekoff (FILE *, off64_t, int, int); libc_hidden_proto (_IO_wfile_seekoff) /* Jumptable functions for proc_files. */ -extern FILE* _IO_proc_open (FILE *, const char *, const char *) - __THROW; -extern FILE* _IO_new_proc_open (FILE *, const char *, const char *) - __THROW; +extern FILE* _IO_proc_open (FILE *, const char *, const char *) __THROW; +libc_hidden_proto (_IO_proc_open) +extern FILE* _IO_new_proc_open (FILE *, const char *, const char *); +libc_hidden_proto (_IO_new_proc_open) extern FILE* _IO_old_proc_open (FILE *, const char *, const char *); extern int _IO_proc_close (FILE *) __THROW; extern int _IO_new_proc_close (FILE *) __THROW; @@ -641,28 +649,30 @@ extern int _IO_str_pbackfail (FILE *, int) __THROW; libc_hidden_proto (_IO_str_pbackfail) extern off64_t _IO_str_seekoff (FILE *, off64_t, int, int) __THROW; libc_hidden_proto (_IO_str_seekoff) -extern void _IO_str_finish (FILE *, int) __THROW; +extern void _IO_str_finish (FILE *, int) __THROW attribute_hidden; /* Other strfile functions */ struct _IO_strfile_; -extern ssize_t _IO_str_count (FILE *) __THROW; +extern ssize_t _IO_str_count (FILE *) __THROW attribute_hidden; /* And the wide character versions. */ extern void _IO_wstr_init_static (FILE *, wchar_t *, size_t, wchar_t *) - __THROW; -extern ssize_t _IO_wstr_count (FILE *) __THROW; -extern wint_t _IO_wstr_overflow (FILE *, wint_t) __THROW; + __THROW attribute_hidden; +extern ssize_t _IO_wstr_count (FILE *) __THROW attribute_hidden; +extern wint_t _IO_wstr_overflow (FILE *, wint_t) __THROW attribute_hidden; extern wint_t _IO_wstr_underflow (FILE *) __THROW; extern off64_t _IO_wstr_seekoff (FILE *, off64_t, int, int) __THROW; extern wint_t _IO_wstr_pbackfail (FILE *, wint_t) __THROW; -extern void _IO_wstr_finish (FILE *, int) __THROW; +extern void _IO_wstr_finish (FILE *, int) __THROW attribute_hidden; -extern int _IO_vasprintf (char **result_ptr, const char *format, - va_list args) __THROW; -extern int _IO_vdprintf (int d, const char *format, va_list arg); +extern int _IO_vasprintf (char **result_ptr, const char *format, va_list ap) + __THROW attribute_hidden; +extern int _IO_vdprintf (int d, const char *format, va_list ap) + attribute_hidden; extern int _IO_vsnprintf (char *string, size_t maxlen, - const char *format, va_list args) __THROW; + const char *format, va_list ap) + __THROW attribute_hidden; extern size_t _IO_getline (FILE *,char *, size_t, int, int); @@ -670,17 +680,21 @@ libc_hidden_proto (_IO_getline) extern size_t _IO_getline_info (FILE *,char *, size_t, int, int, int *); libc_hidden_proto (_IO_getline_info) -extern ssize_t _IO_getdelim (char **, size_t *, int, FILE *); -extern size_t _IO_getwline (FILE *,wchar_t *, size_t, wint_t, int); -extern size_t _IO_getwline_info (FILE *,wchar_t *, size_t, - wint_t, int, wint_t *); +extern ssize_t _IO_getdelim (char **, size_t *, int, FILE *) + attribute_hidden; +extern size_t _IO_getwline (FILE *, wchar_t *, size_t, wint_t, int) + attribute_hidden; +extern size_t _IO_getwline_info (FILE *, wchar_t *, size_t, + wint_t, int, wint_t *) + attribute_hidden; extern struct _IO_FILE_plus *_IO_list_all; libc_hidden_proto (_IO_list_all) extern void (*_IO_cleanup_registration_needed) (void); extern void _IO_str_init_static_internal (struct _IO_strfile_ *, char *, - size_t, char *) __THROW; + size_t, char *) + __THROW attribute_hidden; extern off64_t _IO_seekoff_unlocked (FILE *, off64_t, int, int) attribute_hidden; extern off64_t _IO_seekpos_unlocked (FILE *, off64_t, int) |