diff options
Diffstat (limited to 'libio')
91 files changed, 192 insertions, 564 deletions
diff --git a/libio/clearerr.c b/libio/clearerr.c index 0a52e05ce3..1a610a6d05 100644 --- a/libio/clearerr.c +++ b/libio/clearerr.c @@ -19,8 +19,7 @@ #include "stdio.h" void -clearerr (fp) - FILE *fp; +clearerr (FILE *fp) { CHECK_FILE (fp, /*nothing*/); _IO_flockfile (fp); diff --git a/libio/clearerr_u.c b/libio/clearerr_u.c index 73b5bc30cf..d0452b23f0 100644 --- a/libio/clearerr_u.c +++ b/libio/clearerr_u.c @@ -19,8 +19,7 @@ #include "stdio.h" void -clearerr_unlocked (fp) - FILE *fp; +clearerr_unlocked (FILE *fp) { CHECK_FILE (fp, /*nothing*/); _IO_clearerr (fp); diff --git a/libio/feof.c b/libio/feof.c index c89182c288..febf1069f4 100644 --- a/libio/feof.c +++ b/libio/feof.c @@ -28,8 +28,7 @@ #include "stdio.h" int -_IO_feof (fp) - _IO_FILE* fp; +_IO_feof (_IO_FILE *fp) { int result; CHECK_FILE (fp, EOF); diff --git a/libio/feof_u.c b/libio/feof_u.c index 4f552caa9d..a582093212 100644 --- a/libio/feof_u.c +++ b/libio/feof_u.c @@ -30,8 +30,7 @@ #undef feof_unlocked int -feof_unlocked (fp) - _IO_FILE* fp; +feof_unlocked (_IO_FILE *fp) { CHECK_FILE (fp, EOF); return _IO_feof_unlocked (fp); diff --git a/libio/ferror.c b/libio/ferror.c index 3f73e761d1..90a3b69496 100644 --- a/libio/ferror.c +++ b/libio/ferror.c @@ -28,8 +28,7 @@ #include "stdio.h" int -_IO_ferror (fp) - _IO_FILE* fp; +_IO_ferror (_IO_FILE *fp) { int result; CHECK_FILE (fp, EOF); diff --git a/libio/ferror_u.c b/libio/ferror_u.c index 08831a0205..f182cb2edd 100644 --- a/libio/ferror_u.c +++ b/libio/ferror_u.c @@ -30,8 +30,7 @@ #undef ferror_unlocked int -ferror_unlocked (fp) - _IO_FILE* fp; +ferror_unlocked (_IO_FILE *fp) { CHECK_FILE (fp, EOF); return _IO_ferror_unlocked (fp); diff --git a/libio/filedoalloc.c b/libio/filedoalloc.c index 78aa3d5236..81d2da62b0 100644 --- a/libio/filedoalloc.c +++ b/libio/filedoalloc.c @@ -91,8 +91,7 @@ local_isatty (int fd) */ int -_IO_file_doallocate (fp) - _IO_FILE *fp; +_IO_file_doallocate (_IO_FILE *fp) { _IO_size_t size; char *p; diff --git a/libio/fileno.c b/libio/fileno.c index c1b02d5f0d..fbf86aa3d3 100644 --- a/libio/fileno.c +++ b/libio/fileno.c @@ -28,8 +28,7 @@ #include <stdio.h> int -__fileno (fp) - _IO_FILE* fp; +__fileno (_IO_FILE *fp) { CHECK_FILE (fp, EOF); diff --git a/libio/fputc.c b/libio/fputc.c index 1d52c8042c..bd271d0382 100644 --- a/libio/fputc.c +++ b/libio/fputc.c @@ -28,9 +28,7 @@ #include "stdio.h" int -fputc (c, fp) - int c; - _IO_FILE *fp; +fputc (int c, _IO_FILE *fp) { int result; CHECK_FILE (fp, EOF); diff --git a/libio/fputc_u.c b/libio/fputc_u.c index c8c15cafd7..9b275f2722 100644 --- a/libio/fputc_u.c +++ b/libio/fputc_u.c @@ -30,9 +30,7 @@ #undef fputc_unlocked int -fputc_unlocked (c, fp) - int c; - _IO_FILE *fp; +fputc_unlocked (int c, _IO_FILE *fp) { CHECK_FILE (fp, EOF); return _IO_putc_unlocked (c, fp); diff --git a/libio/fputwc.c b/libio/fputwc.c index 3781af0d41..48b8243f52 100644 --- a/libio/fputwc.c +++ b/libio/fputwc.c @@ -28,9 +28,7 @@ #include <wchar.h> wint_t -fputwc (wc, fp) - wchar_t wc; - _IO_FILE *fp; +fputwc (wchar_t wc, _IO_FILE *fp) { wint_t result; CHECK_FILE (fp, EOF); diff --git a/libio/fputwc_u.c b/libio/fputwc_u.c index 86e10590d2..5f247bb842 100644 --- a/libio/fputwc_u.c +++ b/libio/fputwc_u.c @@ -30,9 +30,7 @@ #undef fputwc_unlocked wint_t -fputwc_unlocked (wc, fp) - wchar_t wc; - _IO_FILE *fp; +fputwc_unlocked (wchar_t wc, _IO_FILE *fp) { CHECK_FILE (fp, WEOF); if (_IO_fwide (fp, 1) < 0) diff --git a/libio/freopen.c b/libio/freopen.c index 035fa1fa79..30691cbcb5 100644 --- a/libio/freopen.c +++ b/libio/freopen.c @@ -35,11 +35,8 @@ #include <kernel-features.h> -FILE* -freopen (filename, mode, fp) - const char* filename; - const char* mode; - FILE* fp; +FILE * +freopen (const char *filename, const char *mode, FILE *fp) { FILE *result; CHECK_FILE (fp, NULL); diff --git a/libio/freopen64.c b/libio/freopen64.c index fc6ccb12f0..cdb3ec1a02 100644 --- a/libio/freopen64.c +++ b/libio/freopen64.c @@ -35,10 +35,7 @@ #include <kernel-features.h> FILE * -freopen64 (filename, mode, fp) - const char* filename; - const char* mode; - FILE *fp; +freopen64 (const char *filename, const char *mode, FILE *fp) { FILE *result; CHECK_FILE (fp, NULL); diff --git a/libio/fseek.c b/libio/fseek.c index 1ee89bac1e..c643ff3a86 100644 --- a/libio/fseek.c +++ b/libio/fseek.c @@ -28,10 +28,7 @@ #include <stdio.h> int -fseek (fp, offset, whence) - _IO_FILE* fp; - long int offset; - int whence; +fseek (_IO_FILE *fp, long int offset, int whence) { int result; CHECK_FILE (fp, -1); diff --git a/libio/fseeko.c b/libio/fseeko.c index 304bb423df..fa1e2a940c 100644 --- a/libio/fseeko.c +++ b/libio/fseeko.c @@ -28,10 +28,7 @@ #include "stdio.h" int -fseeko (fp, offset, whence) - _IO_FILE* fp; - off_t offset; - int whence; +fseeko (_IO_FILE *fp, off_t offset, int whence) { int result; CHECK_FILE (fp, -1); diff --git a/libio/fseeko64.c b/libio/fseeko64.c index 8dc57cb579..2d7b4d7df9 100644 --- a/libio/fseeko64.c +++ b/libio/fseeko64.c @@ -32,10 +32,7 @@ #ifndef __OFF_T_MATCHES_OFF64_T int -fseeko64 (fp, offset, whence) - _IO_FILE* fp; - __off64_t offset; - int whence; +fseeko64 (_IO_FILE *fp, __off64_t offset, int whence) { int result; CHECK_FILE (fp, -1); diff --git a/libio/ftello.c b/libio/ftello.c index fc56f7c601..1c1c1a3a71 100644 --- a/libio/ftello.c +++ b/libio/ftello.c @@ -31,8 +31,7 @@ off_t -__ftello (fp) - _IO_FILE *fp; +__ftello (_IO_FILE *fp) { _IO_off64_t pos; CHECK_FILE (fp, -1L); diff --git a/libio/ftello64.c b/libio/ftello64.c index 998fc15e25..0e6a0778fc 100644 --- a/libio/ftello64.c +++ b/libio/ftello64.c @@ -32,8 +32,7 @@ #ifndef __OFF_T_MATCHES_OFF64_T off64_t -ftello64 (fp) - _IO_FILE *fp; +ftello64 (_IO_FILE *fp) { _IO_off64_t pos; CHECK_FILE (fp, -1L); diff --git a/libio/fwide.c b/libio/fwide.c index 1a93e74c2e..fee98bdbc6 100644 --- a/libio/fwide.c +++ b/libio/fwide.c @@ -29,9 +29,7 @@ #include <wchar.h> int -fwide (fp, mode) - _IO_FILE *fp; - int mode; +fwide (_IO_FILE *fp, int mode) { int result; diff --git a/libio/genops.c b/libio/genops.c index 45c9d41c89..873bd77c3a 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -55,8 +55,7 @@ flush_cleanup (void *not_used) #endif void -_IO_un_link (fp) - struct _IO_FILE_plus *fp; +_IO_un_link (struct _IO_FILE_plus *fp) { if (fp->file._flags & _IO_LINKED) { @@ -94,8 +93,7 @@ _IO_un_link (fp) libc_hidden_def (_IO_un_link) void -_IO_link_in (fp) - struct _IO_FILE_plus *fp; +_IO_link_in (struct _IO_FILE_plus *fp) { if ((fp->file._flags & _IO_LINKED) == 0) { @@ -124,9 +122,7 @@ libc_hidden_def (_IO_link_in) _IO_ssize_t _IO_least_marker (_IO_FILE *fp, char *end_p); _IO_ssize_t -_IO_least_marker (fp, end_p) - _IO_FILE *fp; - char *end_p; +_IO_least_marker (_IO_FILE *fp, char *end_p) { _IO_ssize_t least_so_far = end_p - fp->_IO_read_base; struct _IO_marker *mark; @@ -139,8 +135,7 @@ _IO_least_marker (fp, end_p) /* Switch current get area from backup buffer to (start of) main get area. */ void -_IO_switch_to_main_get_area (fp) - _IO_FILE *fp; +_IO_switch_to_main_get_area (_IO_FILE *fp) { char *tmp; fp->_flags &= ~_IO_IN_BACKUP; @@ -159,8 +154,7 @@ _IO_switch_to_main_get_area (fp) /* Switch current get area from main get area to (end of) backup area. */ void -_IO_switch_to_backup_area (fp) - _IO_FILE *fp; +_IO_switch_to_backup_area (_IO_FILE *fp) { char *tmp; fp->_flags |= _IO_IN_BACKUP; @@ -177,8 +171,7 @@ _IO_switch_to_backup_area (fp) } int -_IO_switch_to_get_mode (fp) - _IO_FILE *fp; +_IO_switch_to_get_mode (_IO_FILE *fp) { if (fp->_IO_write_ptr > fp->_IO_write_base) if (_IO_OVERFLOW (fp, EOF) == EOF) @@ -201,8 +194,7 @@ _IO_switch_to_get_mode (fp) libc_hidden_def (_IO_switch_to_get_mode) void -_IO_free_backup_area (fp) - _IO_FILE *fp; +_IO_free_backup_area (_IO_FILE *fp) { if (_IO_in_backup (fp)) _IO_switch_to_main_get_area (fp); /* Just in case. */ @@ -215,8 +207,7 @@ libc_hidden_def (_IO_free_backup_area) #if 0 int -_IO_switch_to_put_mode (fp) - _IO_FILE *fp; +_IO_switch_to_put_mode (_IO_FILE *fp) { fp->_IO_write_base = fp->_IO_read_ptr; fp->_IO_write_ptr = fp->_IO_read_ptr; @@ -233,9 +224,7 @@ _IO_switch_to_put_mode (fp) #endif int -__overflow (f, ch) - _IO_FILE *f; - int ch; +__overflow (_IO_FILE *f, int ch) { /* This is a single-byte stream. */ if (f->_mode == 0) @@ -325,8 +314,7 @@ save_for_backup (fp, end_p) } int -__underflow (fp) - _IO_FILE *fp; +__underflow (_IO_FILE *fp) { #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T if (_IO_vtable_offset (fp) == 0 && _IO_fwide (fp, -1) != -1) @@ -358,8 +346,7 @@ __underflow (fp) libc_hidden_def (__underflow) int -__uflow (fp) - _IO_FILE *fp; +__uflow (_IO_FILE *fp) { #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T if (_IO_vtable_offset (fp) == 0 && _IO_fwide (fp, -1) != -1) @@ -391,11 +378,7 @@ __uflow (fp) libc_hidden_def (__uflow) void -_IO_setb (f, b, eb, a) - _IO_FILE *f; - char *b; - char *eb; - int a; +_IO_setb (_IO_FILE *f, char *b, char *eb, int a) { if (f->_IO_buf_base && !(f->_flags & _IO_USER_BUF)) free (f->_IO_buf_base); @@ -409,8 +392,7 @@ _IO_setb (f, b, eb, a) libc_hidden_def (_IO_setb) void -_IO_doallocbuf (fp) - _IO_FILE *fp; +_IO_doallocbuf (_IO_FILE *fp) { if (fp->_IO_buf_base) return; @@ -422,15 +404,13 @@ _IO_doallocbuf (fp) libc_hidden_def (_IO_doallocbuf) int -_IO_default_underflow (fp) - _IO_FILE *fp; +_IO_default_underflow (_IO_FILE *fp) { return EOF; } int -_IO_default_uflow (fp) - _IO_FILE *fp; +_IO_default_uflow (_IO_FILE *fp) { int ch = _IO_UNDERFLOW (fp); if (ch == EOF) @@ -440,10 +420,7 @@ _IO_default_uflow (fp) libc_hidden_def (_IO_default_uflow) _IO_size_t -_IO_default_xsputn (f, data, n) - _IO_FILE *f; - const void *data; - _IO_size_t n; +_IO_default_xsputn (_IO_FILE *f, const void *data, _IO_size_t n) { const char *s = (char *) data; _IO_size_t more = n; @@ -486,10 +463,7 @@ _IO_default_xsputn (f, data, n) libc_hidden_def (_IO_default_xsputn) _IO_size_t -_IO_sgetn (fp, data, n) - _IO_FILE *fp; - void *data; - _IO_size_t n; +_IO_sgetn (_IO_FILE *fp, void *data, _IO_size_t n) { /* FIXME handle putback buffer here! */ return _IO_XSGETN (fp, data, n); @@ -497,10 +471,7 @@ _IO_sgetn (fp, data, n) libc_hidden_def (_IO_sgetn) _IO_size_t -_IO_default_xsgetn (fp, data, n) - _IO_FILE *fp; - void *data; - _IO_size_t n; +_IO_default_xsgetn (_IO_FILE *fp, void *data, _IO_size_t n) { _IO_size_t more = n; char *s = (char*) data; @@ -542,18 +513,14 @@ libc_hidden_def (_IO_default_xsgetn) #if 0 /* Seems not to be needed. --drepper */ int -_IO_sync (fp) - _IO_FILE *fp; +_IO_sync (_IO_FILE *fp) { return 0; } #endif _IO_FILE * -_IO_default_setbuf (fp, p, len) - _IO_FILE *fp; - char *p; - _IO_ssize_t len; +_IO_default_setbuf (_IO_FILE *fp, char *p, _IO_ssize_t len) { if (_IO_SYNC (fp) == EOF) return NULL; @@ -573,17 +540,13 @@ _IO_default_setbuf (fp, p, len) } _IO_off64_t -_IO_default_seekpos (fp, pos, mode) - _IO_FILE *fp; - _IO_off64_t pos; - int mode; +_IO_default_seekpos (_IO_FILE *fp, _IO_off64_t pos, int mode) { return _IO_SEEKOFF (fp, pos, 0, mode); } int -_IO_default_doallocate (fp) - _IO_FILE *fp; +_IO_default_doallocate (_IO_FILE *fp) { char *buf; @@ -597,18 +560,14 @@ _IO_default_doallocate (fp) libc_hidden_def (_IO_default_doallocate) void -_IO_init (fp, flags) - _IO_FILE *fp; - int flags; +_IO_init (_IO_FILE *fp, int flags) { _IO_no_init (fp, flags, -1, NULL, NULL); } libc_hidden_def (_IO_init) void -_IO_old_init (fp, flags) - _IO_FILE *fp; - int flags; +_IO_old_init (_IO_FILE *fp, int flags) { fp->_flags = _IO_MAGIC|flags; fp->_flags2 = 0; @@ -673,8 +632,7 @@ _IO_no_init (fp, flags, orientation, wd, jmp) } int -_IO_default_sync (fp) - _IO_FILE *fp; +_IO_default_sync (_IO_FILE *fp) { return 0; } @@ -683,9 +641,7 @@ _IO_default_sync (fp) current implementation, this function can get called twice! */ void -_IO_default_finish (fp, dummy) - _IO_FILE *fp; - int dummy; +_IO_default_finish (_IO_FILE *fp, int dummy) { struct _IO_marker *mark; if (fp->_IO_buf_base && !(fp->_flags & _IO_USER_BUF)) @@ -713,19 +669,13 @@ _IO_default_finish (fp, dummy) libc_hidden_def (_IO_default_finish) _IO_off64_t -_IO_default_seekoff (fp, offset, dir, mode) - _IO_FILE *fp; - _IO_off64_t offset; - int dir; - int mode; +_IO_default_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode) { return _IO_pos_BAD; } int -_IO_sputbackc (fp, c) - _IO_FILE *fp; - int c; +_IO_sputbackc (_IO_FILE *fp, int c) { int result; @@ -746,8 +696,7 @@ _IO_sputbackc (fp, c) libc_hidden_def (_IO_sputbackc) int -_IO_sungetc (fp) - _IO_FILE *fp; +_IO_sungetc (_IO_FILE *fp) { int result; @@ -769,9 +718,7 @@ _IO_sungetc (fp) /* Seems not to be needed. */ #if 0 void -_IO_set_column (fp, c) - _IO_FILE *fp; - int c; +_IO_set_column (_IO_FILE *fp, int c) { if (c == -1) fp->_column = -1; @@ -780,9 +727,7 @@ _IO_set_column (fp, c) } #else int -_IO_set_column (fp, i) - _IO_FILE *fp; - int i; +_IO_set_column (_IO_FILE *fp, int i) { fp->_cur_column = i + 1; return 0; @@ -792,10 +737,7 @@ _IO_set_column (fp, i) unsigned -_IO_adjust_column (start, line, count) - unsigned start; - const char *line; - int count; +_IO_adjust_column (unsigned start, const char *line, int count) { const char *ptr = line + count; while (ptr > line) @@ -808,8 +750,7 @@ libc_hidden_def (_IO_adjust_column) #if 0 /* Seems not to be needed. --drepper */ int -_IO_get_column (fp) - _IO_FILE *fp; +_IO_get_column (_IO_FILE *fp) { if (fp->_cur_column) return _IO_adjust_column (fp->_cur_column - 1, @@ -1029,9 +970,7 @@ _IO_cleanup (void) void -_IO_init_marker (marker, fp) - struct _IO_marker *marker; - _IO_FILE *fp; +_IO_init_marker (struct _IO_marker *marker, _IO_FILE *fp) { marker->_sbuf = fp; if (_IO_in_put_mode (fp)) @@ -1047,8 +986,7 @@ _IO_init_marker (marker, fp) } void -_IO_remove_marker (marker) - struct _IO_marker *marker; +_IO_remove_marker (struct _IO_marker *marker) { /* Unlink from sb's chain. */ struct _IO_marker **ptr = &marker->_sbuf->_markers; @@ -1071,17 +1009,14 @@ _IO_remove_marker (marker) #define BAD_DELTA EOF int -_IO_marker_difference (mark1, mark2) - struct _IO_marker *mark1; - struct _IO_marker *mark2; +_IO_marker_difference (struct _IO_marker *mark1, struct _IO_marker *mark2) { return mark1->_pos - mark2->_pos; } /* Return difference between MARK and current position of MARK's stream. */ int -_IO_marker_delta (mark) - struct _IO_marker *mark; +_IO_marker_delta (struct _IO_marker *mark) { int cur_pos; if (mark->_sbuf == NULL) @@ -1094,10 +1029,7 @@ _IO_marker_delta (mark) } int -_IO_seekmark (fp, mark, delta) - _IO_FILE *fp; - struct _IO_marker *mark; - int delta; +_IO_seekmark (_IO_FILE *fp, struct _IO_marker *mark, int delta) { if (mark->_sbuf != fp) return EOF; @@ -1117,8 +1049,7 @@ _IO_seekmark (fp, mark, delta) } void -_IO_unsave_markers (fp) - _IO_FILE *fp; +_IO_unsave_markers (_IO_FILE *fp) { struct _IO_marker *mark = fp->_markers; if (mark) @@ -1148,9 +1079,7 @@ libc_hidden_def (_IO_unsave_markers) #if 0 /* Seems not to be needed. --drepper */ int -_IO_nobackup_pbackfail (fp, c) - _IO_FILE *fp; - int c; +_IO_nobackup_pbackfail (_IO_FILE *fp, int c) { if (fp->_IO_read_ptr > fp->_IO_read_base) fp->_IO_read_ptr--; @@ -1161,9 +1090,7 @@ _IO_nobackup_pbackfail (fp, c) #endif int -_IO_default_pbackfail (fp, c) - _IO_FILE *fp; - int c; +_IO_default_pbackfail (_IO_FILE *fp, int c) { if (fp->_IO_read_ptr > fp->_IO_read_base && !_IO_in_backup (fp) && (unsigned char) fp->_IO_read_ptr[-1] == c) @@ -1220,51 +1147,37 @@ _IO_default_pbackfail (fp, c) libc_hidden_def (_IO_default_pbackfail) _IO_off64_t -_IO_default_seek (fp, offset, dir) - _IO_FILE *fp; - _IO_off64_t offset; - int dir; +_IO_default_seek (_IO_FILE *fp, _IO_off64_t offset, int dir) { return _IO_pos_BAD; } int -_IO_default_stat (fp, st) - _IO_FILE *fp; - void* st; +_IO_default_stat (_IO_FILE *fp, void *st) { return EOF; } _IO_ssize_t -_IO_default_read (fp, data, n) - _IO_FILE* fp; - void *data; - _IO_ssize_t n; +_IO_default_read (_IO_FILE *fp, void *data, _IO_ssize_t n) { return -1; } _IO_ssize_t -_IO_default_write (fp, data, n) - _IO_FILE *fp; - const void *data; - _IO_ssize_t n; +_IO_default_write (_IO_FILE *fp, const void *data, _IO_ssize_t n) { return 0; } int -_IO_default_showmanyc (fp) - _IO_FILE *fp; +_IO_default_showmanyc (_IO_FILE *fp) { return -1; } void -_IO_default_imbue (fp, locale) - _IO_FILE *fp; - void *locale; +_IO_default_imbue (_IO_FILE *fp, void *locale) { } @@ -1283,16 +1196,14 @@ _IO_iter_end (void) libc_hidden_def (_IO_iter_end) _IO_ITER -_IO_iter_next(iter) - _IO_ITER iter; +_IO_iter_next (_IO_ITER iter) { return iter->_chain; } libc_hidden_def (_IO_iter_next) _IO_FILE * -_IO_iter_file(iter) - _IO_ITER iter; +_IO_iter_file (_IO_ITER iter) { return iter; } diff --git a/libio/getc.c b/libio/getc.c index 270c47a660..d19a229cbd 100644 --- a/libio/getc.c +++ b/libio/getc.c @@ -30,8 +30,7 @@ #undef _IO_getc int -_IO_getc (fp) - FILE *fp; +_IO_getc (FILE *fp) { int result; CHECK_FILE (fp, EOF); diff --git a/libio/getwc.c b/libio/getwc.c index a6e8fd7e97..7b64533cfb 100644 --- a/libio/getwc.c +++ b/libio/getwc.c @@ -31,8 +31,7 @@ #undef _IO_getwc wint_t -_IO_getwc (fp) - FILE *fp; +_IO_getwc (FILE *fp) { wint_t result; CHECK_FILE (fp, WEOF); diff --git a/libio/iofclose.c b/libio/iofclose.c index 3281e3f41b..4e079ed1cd 100644 --- a/libio/iofclose.c +++ b/libio/iofclose.c @@ -35,8 +35,7 @@ #endif int -_IO_new_fclose (fp) - _IO_FILE *fp; +_IO_new_fclose (_IO_FILE *fp) { int status; diff --git a/libio/iofdopen.c b/libio/iofdopen.c index e7d84ae983..e01524bb1f 100644 --- a/libio/iofdopen.c +++ b/libio/iofdopen.c @@ -41,9 +41,7 @@ #endif _IO_FILE * -_IO_new_fdopen (fd, mode) - int fd; - const char *mode; +_IO_new_fdopen (int fd, const char *mode) { int read_write; struct locked_FILE diff --git a/libio/iofflush.c b/libio/iofflush.c index 236e145a91..37a0f9c496 100644 --- a/libio/iofflush.c +++ b/libio/iofflush.c @@ -28,8 +28,7 @@ #include <stdio.h> int -_IO_fflush (fp) - _IO_FILE *fp; +_IO_fflush (_IO_FILE *fp) { if (fp == NULL) return _IO_flush_all (); diff --git a/libio/iofflush_u.c b/libio/iofflush_u.c index e00447991d..ee76373f61 100644 --- a/libio/iofflush_u.c +++ b/libio/iofflush_u.c @@ -28,8 +28,7 @@ #include <stdio.h> int -__fflush_unlocked (fp) - _IO_FILE *fp; +__fflush_unlocked (_IO_FILE *fp) { if (fp == NULL) return _IO_flush_all (); diff --git a/libio/iofgetpos.c b/libio/iofgetpos.c index 8f900d517a..9b7eec9cbd 100644 --- a/libio/iofgetpos.c +++ b/libio/iofgetpos.c @@ -40,9 +40,7 @@ #include <shlib-compat.h> int -_IO_new_fgetpos (fp, posp) - _IO_FILE *fp; - _IO_fpos_t *posp; +_IO_new_fgetpos (_IO_FILE *fp, _IO_fpos_t *posp) { _IO_off64_t pos; int result = 0; diff --git a/libio/iofgetpos64.c b/libio/iofgetpos64.c index 71b0d6492c..c9e7bb06a0 100644 --- a/libio/iofgetpos64.c +++ b/libio/iofgetpos64.c @@ -31,9 +31,7 @@ #ifndef __OFF_T_MATCHES_OFF64_T int -_IO_new_fgetpos64 (fp, posp) - _IO_FILE *fp; - _IO_fpos64_t *posp; +_IO_new_fgetpos64 (_IO_FILE *fp, _IO_fpos64_t *posp) { _IO_off64_t pos; int result = 0; diff --git a/libio/iofgets.c b/libio/iofgets.c index f001b623f6..5fcb8763ca 100644 --- a/libio/iofgets.c +++ b/libio/iofgets.c @@ -28,10 +28,7 @@ #include <stdio.h> char * -_IO_fgets (buf, n, fp) - char *buf; - int n; - _IO_FILE *fp; +_IO_fgets (char *buf, int n, _IO_FILE *fp) { _IO_size_t count; char *result; diff --git a/libio/iofgets_u.c b/libio/iofgets_u.c index f6acf646d7..8bbb3d3e31 100644 --- a/libio/iofgets_u.c +++ b/libio/iofgets_u.c @@ -28,10 +28,7 @@ #include <stdio.h> char * -__fgets_unlocked (buf, n, fp) - char *buf; - int n; - _IO_FILE *fp; +__fgets_unlocked (char *buf, int n, _IO_FILE *fp) { _IO_size_t count; char *result; diff --git a/libio/iofgetws.c b/libio/iofgetws.c index a18fb3d5c0..9ead37a29f 100644 --- a/libio/iofgetws.c +++ b/libio/iofgetws.c @@ -28,10 +28,7 @@ #include <wchar.h> wchar_t * -fgetws (buf, n, fp) - wchar_t *buf; - int n; - _IO_FILE *fp; +fgetws (wchar_t *buf, int n, _IO_FILE *fp) { _IO_size_t count; wchar_t *result; diff --git a/libio/iofgetws_u.c b/libio/iofgetws_u.c index 6717978958..124d58752a 100644 --- a/libio/iofgetws_u.c +++ b/libio/iofgetws_u.c @@ -28,10 +28,7 @@ #include <wchar.h> wchar_t * -fgetws_unlocked (buf, n, fp) - wchar_t *buf; - int n; - _IO_FILE *fp; +fgetws_unlocked (wchar_t *buf, int n, _IO_FILE *fp) { _IO_size_t count; wchar_t *result; diff --git a/libio/iofopen64.c b/libio/iofopen64.c index 89f13aa9ae..f60234595e 100644 --- a/libio/iofopen64.c +++ b/libio/iofopen64.c @@ -32,9 +32,7 @@ #if !defined _LIBC || (defined O_LARGEFILE && O_LARGEFILE != 0) _IO_FILE * -_IO_fopen64 (filename, mode) - const char *filename; - const char *mode; +_IO_fopen64 (const char *filename, const char *mode) { return __fopen_internal (filename, mode, 0); } diff --git a/libio/iofopncook.c b/libio/iofopncook.c index 978a7fa345..b16a263e8a 100644 --- a/libio/iofopncook.c +++ b/libio/iofopncook.c @@ -40,10 +40,7 @@ static _IO_off64_t _IO_cookie_seekoff (_IO_FILE *fp, _IO_off64_t offset, static int _IO_cookie_close (_IO_FILE* fp); static _IO_ssize_t -_IO_cookie_read (fp, buf, size) - _IO_FILE *fp; - void *buf; - _IO_ssize_t size; +_IO_cookie_read (_IO_FILE *fp, void *buf, _IO_ssize_t size) { struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp; @@ -54,10 +51,7 @@ _IO_cookie_read (fp, buf, size) } static _IO_ssize_t -_IO_cookie_write (fp, buf, size) - _IO_FILE *fp; - const void *buf; - _IO_ssize_t size; +_IO_cookie_write (_IO_FILE *fp, const void *buf, _IO_ssize_t size) { struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp; @@ -75,10 +69,7 @@ _IO_cookie_write (fp, buf, size) } static _IO_off64_t -_IO_cookie_seek (fp, offset, dir) - _IO_FILE *fp; - _IO_off64_t offset; - int dir; +_IO_cookie_seek (_IO_FILE *fp, _IO_off64_t offset, int dir) { struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp; @@ -90,8 +81,7 @@ _IO_cookie_seek (fp, offset, dir) } static int -_IO_cookie_close (fp) - _IO_FILE *fp; +_IO_cookie_close (_IO_FILE *fp) { struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp; @@ -103,11 +93,7 @@ _IO_cookie_close (fp) static _IO_off64_t -_IO_cookie_seekoff (fp, offset, dir, mode) - _IO_FILE *fp; - _IO_off64_t offset; - int dir; - int mode; +_IO_cookie_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode) { /* We must force the fileops code to always use seek to determine the position. */ @@ -218,10 +204,7 @@ _IO_FILE * _IO_old_fopencookie (void *cookie, const char *mode, static _IO_off64_t attribute_compat_text_section -_IO_old_cookie_seek (fp, offset, dir) - _IO_FILE *fp; - _IO_off64_t offset; - int dir; +_IO_old_cookie_seek (_IO_FILE *fp, _IO_off64_t offset, int dir) { struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp; int (*seek) (_IO_FILE *, _IO_off_t, int); diff --git a/libio/iofputs.c b/libio/iofputs.c index d1e34e40b4..504d0e92b8 100644 --- a/libio/iofputs.c +++ b/libio/iofputs.c @@ -28,9 +28,7 @@ #include <string.h> int -_IO_fputs (str, fp) - const char *str; - _IO_FILE *fp; +_IO_fputs (const char *str, _IO_FILE *fp) { _IO_size_t len = strlen (str); int result = EOF; diff --git a/libio/iofputs_u.c b/libio/iofputs_u.c index f823686d5b..4dc3e3c639 100644 --- a/libio/iofputs_u.c +++ b/libio/iofputs_u.c @@ -29,9 +29,7 @@ #include <string.h> int -__fputs_unlocked (str, fp) - const char *str; - _IO_FILE *fp; +__fputs_unlocked (const char *str, _IO_FILE *fp) { _IO_size_t len = strlen (str); int result = EOF; diff --git a/libio/iofputws.c b/libio/iofputws.c index 4c59a3aa52..b3b7f991c6 100644 --- a/libio/iofputws.c +++ b/libio/iofputws.c @@ -28,9 +28,7 @@ #include <wchar.h> int -fputws (str, fp) - const wchar_t *str; - _IO_FILE *fp; +fputws (const wchar_t *str, _IO_FILE *fp) { _IO_size_t len = __wcslen (str); int result = EOF; diff --git a/libio/iofputws_u.c b/libio/iofputws_u.c index 092aeb4c01..aa7447b0ed 100644 --- a/libio/iofputws_u.c +++ b/libio/iofputws_u.c @@ -29,9 +29,7 @@ #include <wchar.h> int -fputws_unlocked (str, fp) - const wchar_t *str; - _IO_FILE *fp; +fputws_unlocked (const wchar_t *str, _IO_FILE *fp) { _IO_size_t len = __wcslen (str); int result = EOF; diff --git a/libio/iofread.c b/libio/iofread.c index 817df76d9f..eb69b05736 100644 --- a/libio/iofread.c +++ b/libio/iofread.c @@ -27,11 +27,7 @@ #include "libioP.h" _IO_size_t -_IO_fread (buf, size, count, fp) - void *buf; - _IO_size_t size; - _IO_size_t count; - _IO_FILE *fp; +_IO_fread (void *buf, _IO_size_t size, _IO_size_t count, _IO_FILE *fp) { _IO_size_t bytes_requested = size * count; _IO_size_t bytes_read; diff --git a/libio/iofread_u.c b/libio/iofread_u.c index ba0bc3e39c..997b71431d 100644 --- a/libio/iofread_u.c +++ b/libio/iofread_u.c @@ -30,11 +30,7 @@ #undef fread_unlocked _IO_size_t -__fread_unlocked (buf, size, count, fp) - void *buf; - _IO_size_t size; - _IO_size_t count; - _IO_FILE *fp; +__fread_unlocked (void *buf, _IO_size_t size, _IO_size_t count, _IO_FILE *fp) { _IO_size_t bytes_requested = size * count; _IO_size_t bytes_read; diff --git a/libio/iofsetpos.c b/libio/iofsetpos.c index 21cc2f73e7..ab031d1e11 100644 --- a/libio/iofsetpos.c +++ b/libio/iofsetpos.c @@ -39,9 +39,7 @@ #include <shlib-compat.h> int -_IO_new_fsetpos (fp, posp) - _IO_FILE *fp; - const _IO_fpos_t *posp; +_IO_new_fsetpos (_IO_FILE *fp, const _IO_fpos_t *posp) { int result; CHECK_FILE (fp, EOF); diff --git a/libio/iofsetpos64.c b/libio/iofsetpos64.c index 95ade6e701..d0e7cfbf71 100644 --- a/libio/iofsetpos64.c +++ b/libio/iofsetpos64.c @@ -31,9 +31,7 @@ #ifndef __OFF_T_MATCHES_OFF64_T int -_IO_new_fsetpos64 (fp, posp) - _IO_FILE *fp; - const _IO_fpos64_t *posp; +_IO_new_fsetpos64 (_IO_FILE *fp, const _IO_fpos64_t *posp) { int result; CHECK_FILE (fp, EOF); diff --git a/libio/ioftell.c b/libio/ioftell.c index 5b7fec6ae4..cf5b7134f4 100644 --- a/libio/ioftell.c +++ b/libio/ioftell.c @@ -30,8 +30,7 @@ /* ANSI explicily requires setting errno to a positive value on failure. */ long int -_IO_ftell (fp) - _IO_FILE *fp; +_IO_ftell (_IO_FILE *fp) { _IO_off64_t pos; CHECK_FILE (fp, -1L); diff --git a/libio/iofwrite.c b/libio/iofwrite.c index 891314693a..48ad4bcc71 100644 --- a/libio/iofwrite.c +++ b/libio/iofwrite.c @@ -27,11 +27,7 @@ #include "libioP.h" _IO_size_t -_IO_fwrite (buf, size, count, fp) - const void *buf; - _IO_size_t size; - _IO_size_t count; - _IO_FILE *fp; +_IO_fwrite (const void *buf, _IO_size_t size, _IO_size_t count, _IO_FILE *fp) { _IO_size_t request = size * count; _IO_size_t written = 0; diff --git a/libio/iogetdelim.c b/libio/iogetdelim.c index ac93044bb5..acc71ccdd6 100644 --- a/libio/iogetdelim.c +++ b/libio/iogetdelim.c @@ -37,11 +37,7 @@ null terminator), or -1 on error or EOF. */ _IO_ssize_t -_IO_getdelim (lineptr, n, delimiter, fp) - char **lineptr; - _IO_size_t *n; - int delimiter; - _IO_FILE *fp; +_IO_getdelim (char **lineptr, _IO_size_t *n, int delimiter, _IO_FILE *fp) { _IO_ssize_t result; _IO_ssize_t cur_len = 0; diff --git a/libio/iogets.c b/libio/iogets.c index 9851e7744c..ead0cb2f6f 100644 --- a/libio/iogets.c +++ b/libio/iogets.c @@ -27,9 +27,8 @@ #include "libioP.h" #include <limits.h> -char* -_IO_gets (buf) - char *buf; +char * +_IO_gets (char *buf) { _IO_size_t count; int ch; diff --git a/libio/iopadn.c b/libio/iopadn.c index 304ce0877c..b0acd8eb4a 100644 --- a/libio/iopadn.c +++ b/libio/iopadn.c @@ -33,10 +33,7 @@ static char const zeroes[PADSIZE] = {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'}; _IO_ssize_t -_IO_padn (fp, pad, count) - _IO_FILE *fp; - int pad; - _IO_ssize_t count; +_IO_padn (_IO_FILE *fp, int pad, _IO_ssize_t count) { char padbuf[PADSIZE]; const char *padptr; diff --git a/libio/iopopen.c b/libio/iopopen.c index 53da776d86..bb6e996066 100644 --- a/libio/iopopen.c +++ b/libio/iopopen.c @@ -106,10 +106,7 @@ unlock (void *not_used) #endif _IO_FILE * -_IO_new_proc_open (fp, command, mode) - _IO_FILE *fp; - const char *command; - const char *mode; +_IO_new_proc_open (_IO_FILE *fp, const char *command, const char *mode) { int read_or_write; int parent_end, child_end; @@ -272,9 +269,7 @@ _IO_new_proc_open (fp, command, mode) } _IO_FILE * -_IO_new_popen (command, mode) - const char *command; - const char *mode; +_IO_new_popen (const char *command, const char *mode) { struct locked_FILE { @@ -306,8 +301,7 @@ _IO_new_popen (command, mode) } int -_IO_new_proc_close (fp) - _IO_FILE *fp; +_IO_new_proc_close (_IO_FILE *fp) { /* This is not name-space clean. FIXME! */ int wstatus; diff --git a/libio/ioputs.c b/libio/ioputs.c index 39b4bb7218..c05e40e482 100644 --- a/libio/ioputs.c +++ b/libio/ioputs.c @@ -29,8 +29,7 @@ #include <limits.h> int -_IO_puts (str) - const char *str; +_IO_puts (const char *str) { int result = EOF; _IO_size_t len = strlen (str); diff --git a/libio/ioseekoff.c b/libio/ioseekoff.c index 11765cfb76..ef5c7d94d5 100644 --- a/libio/ioseekoff.c +++ b/libio/ioseekoff.c @@ -35,11 +35,7 @@ extern int errno; #endif _IO_off64_t -_IO_seekoff_unlocked (fp, offset, dir, mode) - _IO_FILE *fp; - _IO_off64_t offset; - int dir; - int mode; +_IO_seekoff_unlocked (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode) { if (dir != _IO_seek_cur && dir != _IO_seek_set && dir != _IO_seek_end) { @@ -71,11 +67,7 @@ _IO_seekoff_unlocked (fp, offset, dir, mode) _IO_off64_t -_IO_seekoff (fp, offset, dir, mode) - _IO_FILE *fp; - _IO_off64_t offset; - int dir; - int mode; +_IO_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode) { _IO_off64_t retval; diff --git a/libio/ioseekpos.c b/libio/ioseekpos.c index a7652a1dde..2616985d48 100644 --- a/libio/ioseekpos.c +++ b/libio/ioseekpos.c @@ -27,10 +27,7 @@ #include <libioP.h> _IO_off64_t -_IO_seekpos_unlocked (fp, pos, mode) - _IO_FILE *fp; - _IO_off64_t pos; - int mode; +_IO_seekpos_unlocked (_IO_FILE *fp, _IO_off64_t pos, int mode) { /* If we have a backup buffer, get rid of it, since the __seekoff callback may not know to do the right thing about it. @@ -51,10 +48,7 @@ _IO_seekpos_unlocked (fp, pos, mode) _IO_off64_t -_IO_seekpos (fp, pos, mode) - _IO_FILE *fp; - _IO_off64_t pos; - int mode; +_IO_seekpos (_IO_FILE *fp, _IO_off64_t pos, int mode) { _IO_off64_t retval; diff --git a/libio/iosetbuffer.c b/libio/iosetbuffer.c index 0a41c10123..4e10dceae1 100644 --- a/libio/iosetbuffer.c +++ b/libio/iosetbuffer.c @@ -27,10 +27,7 @@ #include "libioP.h" void -_IO_setbuffer (fp, buf, size) - _IO_FILE *fp; - char *buf; - _IO_size_t size; +_IO_setbuffer (_IO_FILE *fp, char *buf, _IO_size_t size) { CHECK_FILE (fp, ); _IO_acquire_lock (fp); diff --git a/libio/iosetvbuf.c b/libio/iosetvbuf.c index 71a64f8fae..5e3dd9458e 100644 --- a/libio/iosetvbuf.c +++ b/libio/iosetvbuf.c @@ -31,11 +31,7 @@ #define _IONBF 2 /* No buffering. */ int -_IO_setvbuf (fp, buf, mode, size) - _IO_FILE *fp; - char *buf; - int mode; - _IO_size_t size; +_IO_setvbuf (_IO_FILE *fp, char *buf, int mode, _IO_size_t size) { int result; CHECK_FILE (fp, EOF); diff --git a/libio/ioungetc.c b/libio/ioungetc.c index 8553399131..7f1fdafb32 100644 --- a/libio/ioungetc.c +++ b/libio/ioungetc.c @@ -27,9 +27,7 @@ #include "libioP.h" int -_IO_ungetc (c, fp) - int c; - _IO_FILE *fp; +_IO_ungetc (int c, _IO_FILE *fp) { int result; CHECK_FILE (fp, EOF); diff --git a/libio/ioungetwc.c b/libio/ioungetwc.c index afc5ce4197..25fe67e425 100644 --- a/libio/ioungetwc.c +++ b/libio/ioungetwc.c @@ -28,9 +28,7 @@ #include <wchar.h> wint_t -ungetwc (c, fp) - wint_t c; - _IO_FILE *fp; +ungetwc (wint_t c, _IO_FILE *fp) { wint_t result; CHECK_FILE (fp, WEOF); diff --git a/libio/iovdprintf.c b/libio/iovdprintf.c index 116912a1af..f49ff5f931 100644 --- a/libio/iovdprintf.c +++ b/libio/iovdprintf.c @@ -28,10 +28,7 @@ #include <stdio_ext.h> int -_IO_vdprintf (d, format, arg) - int d; - const char *format; - _IO_va_list arg; +_IO_vdprintf (int d, const char *format, _IO_va_list arg) { struct _IO_FILE_plus tmpfil; struct _IO_wide_data wd; diff --git a/libio/iovsscanf.c b/libio/iovsscanf.c index c4fbd1b610..be8346e213 100644 --- a/libio/iovsscanf.c +++ b/libio/iovsscanf.c @@ -28,10 +28,7 @@ #include "strfile.h" int -_IO_vsscanf (string, format, args) - const char *string; - const char *format; - _IO_va_list args; +_IO_vsscanf (const char *string, const char *format, _IO_va_list args) { int ret; _IO_strfile sf; diff --git a/libio/iowpadn.c b/libio/iowpadn.c index e65a6492a6..affbd32bd0 100644 --- a/libio/iowpadn.c +++ b/libio/iowpadn.c @@ -39,10 +39,7 @@ static wchar_t const zeroes[PADSIZE] = }; _IO_ssize_t -_IO_wpadn (fp, pad, count) - _IO_FILE *fp; - wint_t pad; - _IO_ssize_t count; +_IO_wpadn (_IO_FILE *fp, wint_t pad, _IO_ssize_t count) { wchar_t padbuf[PADSIZE]; const wchar_t *padptr; diff --git a/libio/libc_fatal.c b/libio/libc_fatal.c index 096cd28500..677acc1898 100644 --- a/libio/libc_fatal.c +++ b/libio/libc_fatal.c @@ -19,8 +19,7 @@ /* Abort with an error message. */ void -__libc_fatal (message) - const char *message; +__libc_fatal (const char *message) { /* This function should write MESSAGE out in the most reliable way. It is called in situations like internal stdio lossage. */ diff --git a/libio/memstream.c b/libio/memstream.c index 84742d1236..58a3484807 100644 --- a/libio/memstream.c +++ b/libio/memstream.c @@ -61,9 +61,7 @@ static const struct _IO_jump_t _IO_mem_jumps = necessary. *BUFLOC and *SIZELOC are updated with the buffer's location and the number of characters written on fflush or fclose. */ _IO_FILE * -__open_memstream (bufloc, sizeloc) - char **bufloc; - _IO_size_t *sizeloc; +__open_memstream (char **bufloc, _IO_size_t *sizeloc) { struct locked_FILE { @@ -105,8 +103,7 @@ weak_alias (__open_memstream, open_memstream) static int -_IO_mem_sync (fp) - _IO_FILE* fp; +_IO_mem_sync (_IO_FILE *fp) { struct _IO_FILE_memstream *mp = (struct _IO_FILE_memstream *) fp; @@ -126,9 +123,7 @@ _IO_mem_sync (fp) static void -_IO_mem_finish (fp, dummy) - _IO_FILE* fp; - int dummy; +_IO_mem_finish (_IO_FILE *fp, int dummy) { struct _IO_FILE_memstream *mp = (struct _IO_FILE_memstream *) fp; diff --git a/libio/oldfileops.c b/libio/oldfileops.c index 25797c830e..4bf0ddb543 100644 --- a/libio/oldfileops.c +++ b/libio/oldfileops.c @@ -114,8 +114,7 @@ extern int errno; void attribute_compat_text_section -_IO_old_file_init (fp) - struct _IO_FILE_plus *fp; +_IO_old_file_init (struct _IO_FILE_plus *fp) { /* POSIX.1 allows another file handle to be used to change the position of our file descriptor. Hence we actually don't know the actual @@ -141,8 +140,7 @@ _IO_old_file_init (fp) int attribute_compat_text_section -_IO_old_file_close_it (fp) - _IO_FILE *fp; +_IO_old_file_close_it (_IO_FILE *fp) { int write_status, close_status; if (!_IO_file_is_open (fp)) @@ -170,9 +168,7 @@ _IO_old_file_close_it (fp) void attribute_compat_text_section -_IO_old_file_finish (fp, dummy) - _IO_FILE *fp; - int dummy; +_IO_old_file_finish (_IO_FILE *fp, int dummy) { if (_IO_file_is_open (fp)) { @@ -185,10 +181,7 @@ _IO_old_file_finish (fp, dummy) _IO_FILE * attribute_compat_text_section -_IO_old_file_fopen (fp, filename, mode) - _IO_FILE *fp; - const char *filename; - const char *mode; +_IO_old_file_fopen (_IO_FILE *fp, const char *filename, const char *mode) { int oflags = 0, omode; int read_write, fdesc; @@ -235,9 +228,7 @@ _IO_old_file_fopen (fp, filename, mode) _IO_FILE * attribute_compat_text_section -_IO_old_file_attach (fp, fd) - _IO_FILE *fp; - int fd; +_IO_old_file_attach (_IO_FILE *fp, int fd) { if (_IO_file_is_open (fp)) return NULL; @@ -255,10 +246,7 @@ _IO_old_file_attach (fp, fd) _IO_FILE * attribute_compat_text_section -_IO_old_file_setbuf (fp, p, len) - _IO_FILE *fp; - char *p; - _IO_ssize_t len; +_IO_old_file_setbuf (_IO_FILE *fp, char *p, _IO_ssize_t len) { if (_IO_default_setbuf (fp, p, len) == NULL) return NULL; @@ -277,10 +265,7 @@ static int old_do_write (_IO_FILE *, const char *, _IO_size_t); int attribute_compat_text_section -_IO_old_do_write (fp, data, to_do) - _IO_FILE *fp; - const char *data; - _IO_size_t to_do; +_IO_old_do_write (_IO_FILE *fp, const char *data, _IO_size_t to_do) { return (to_do == 0 || (_IO_size_t) old_do_write (fp, data, to_do) == to_do) ? 0 : EOF; @@ -288,10 +273,7 @@ _IO_old_do_write (fp, data, to_do) static int attribute_compat_text_section -old_do_write (fp, data, to_do) - _IO_FILE *fp; - const char *data; - _IO_size_t to_do; +old_do_write (_IO_FILE *fp, const char *data, _IO_size_t to_do) { _IO_size_t count; if (fp->_flags & _IO_IS_APPENDING) @@ -321,8 +303,7 @@ old_do_write (fp, data, to_do) int attribute_compat_text_section -_IO_old_file_underflow (fp) - _IO_FILE *fp; +_IO_old_file_underflow (_IO_FILE *fp) { _IO_ssize_t count; #if 0 @@ -386,9 +367,7 @@ _IO_old_file_underflow (fp) int attribute_compat_text_section -_IO_old_file_overflow (f, ch) - _IO_FILE *f; - int ch; +_IO_old_file_overflow (_IO_FILE *f, int ch) { if (f->_flags & _IO_NO_WRITES) /* SET ERROR */ { @@ -438,8 +417,7 @@ _IO_old_file_overflow (f, ch) int attribute_compat_text_section -_IO_old_file_sync (fp) - _IO_FILE *fp; +_IO_old_file_sync (_IO_FILE *fp) { _IO_ssize_t delta; int retval = 0; @@ -473,11 +451,7 @@ _IO_old_file_sync (fp) _IO_off64_t attribute_compat_text_section -_IO_old_file_seekoff (fp, offset, dir, mode) - _IO_FILE *fp; - _IO_off64_t offset; - int dir; - int mode; +_IO_old_file_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode) { _IO_off_t result; _IO_off64_t delta, new_offset; @@ -660,10 +634,7 @@ resync: _IO_ssize_t attribute_compat_text_section -_IO_old_file_write (f, data, n) - _IO_FILE *f; - const void *data; - _IO_ssize_t n; +_IO_old_file_write (_IO_FILE *f, const void *data, _IO_ssize_t n) { _IO_ssize_t to_do = n; while (to_do > 0) @@ -685,10 +656,7 @@ _IO_old_file_write (f, data, n) _IO_size_t attribute_compat_text_section -_IO_old_file_xsputn (f, data, n) - _IO_FILE *f; - const void *data; - _IO_size_t n; +_IO_old_file_xsputn (_IO_FILE *f, const void *data, _IO_size_t n) { const char *s = (char *) data; _IO_size_t to_do = n; diff --git a/libio/oldiofclose.c b/libio/oldiofclose.c index a967c2d204..aee8c538ca 100644 --- a/libio/oldiofclose.c +++ b/libio/oldiofclose.c @@ -33,8 +33,7 @@ int attribute_compat_text_section -_IO_old_fclose (fp) - _IO_FILE *fp; +_IO_old_fclose (_IO_FILE *fp) { int status; diff --git a/libio/oldiofdopen.c b/libio/oldiofdopen.c index e068ec70fc..f701858df6 100644 --- a/libio/oldiofdopen.c +++ b/libio/oldiofdopen.c @@ -38,9 +38,7 @@ _IO_FILE * attribute_compat_text_section -_IO_old_fdopen (fd, mode) - int fd; - const char *mode; +_IO_old_fdopen (int fd, const char *mode) { int read_write; int posix_mode = 0; diff --git a/libio/oldiofgetpos.c b/libio/oldiofgetpos.c index e76a5a158f..0b4c3509e3 100644 --- a/libio/oldiofgetpos.c +++ b/libio/oldiofgetpos.c @@ -32,9 +32,7 @@ int attribute_compat_text_section -_IO_old_fgetpos (fp, posp) - _IO_FILE *fp; - _IO_fpos_t *posp; +_IO_old_fgetpos (_IO_FILE *fp, _IO_fpos_t *posp) { _IO_off_t pos; CHECK_FILE (fp, EOF); diff --git a/libio/oldiofgetpos64.c b/libio/oldiofgetpos64.c index db27f88b70..5a0b02be05 100644 --- a/libio/oldiofgetpos64.c +++ b/libio/oldiofgetpos64.c @@ -32,9 +32,7 @@ int attribute_compat_text_section -_IO_old_fgetpos64 (fp, posp) - _IO_FILE *fp; - _IO_fpos64_t *posp; +_IO_old_fgetpos64 (_IO_FILE *fp, _IO_fpos64_t *posp) { _IO_off64_t pos; CHECK_FILE (fp, EOF); diff --git a/libio/oldiofopen.c b/libio/oldiofopen.c index a90a60168b..0441d007d7 100644 --- a/libio/oldiofopen.c +++ b/libio/oldiofopen.c @@ -34,9 +34,7 @@ _IO_FILE * attribute_compat_text_section -_IO_old_fopen (filename, mode) - const char *filename; - const char *mode; +_IO_old_fopen (const char *filename, const char *mode) { struct locked_FILE { diff --git a/libio/oldiofsetpos.c b/libio/oldiofsetpos.c index 24571b4719..b85cb82b02 100644 --- a/libio/oldiofsetpos.c +++ b/libio/oldiofsetpos.c @@ -31,9 +31,7 @@ #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) int attribute_compat_text_section -_IO_old_fsetpos (fp, posp) - _IO_FILE *fp; - const _IO_fpos_t *posp; +_IO_old_fsetpos (_IO_FILE *fp, const _IO_fpos_t *posp) { int result; CHECK_FILE (fp, EOF); diff --git a/libio/oldiofsetpos64.c b/libio/oldiofsetpos64.c index 3b8eba1a54..914c5715b1 100644 --- a/libio/oldiofsetpos64.c +++ b/libio/oldiofsetpos64.c @@ -32,9 +32,7 @@ int attribute_compat_text_section -_IO_old_fsetpos64 (fp, posp) - _IO_FILE *fp; - const _IO_fpos64_t *posp; +_IO_old_fsetpos64 (_IO_FILE *fp, const _IO_fpos64_t *posp) { int result; CHECK_FILE (fp, EOF); diff --git a/libio/oldiopopen.c b/libio/oldiopopen.c index fb4c7b8597..b22aa464a4 100644 --- a/libio/oldiopopen.c +++ b/libio/oldiopopen.c @@ -115,10 +115,7 @@ unlock (void *not_used) _IO_FILE * attribute_compat_text_section -_IO_old_proc_open (fp, command, mode) - _IO_FILE *fp; - const char *command; - const char *mode; +_IO_old_proc_open (_IO_FILE *fp, const char *command, const char *mode) { volatile int read_or_write; volatile int parent_end, child_end; @@ -194,9 +191,7 @@ _IO_old_proc_open (fp, command, mode) _IO_FILE * attribute_compat_text_section -_IO_old_popen (command, mode) - const char *command; - const char *mode; +_IO_old_popen (const char *command, const char *mode) { struct locked_FILE { @@ -229,8 +224,7 @@ _IO_old_popen (command, mode) int attribute_compat_text_section -_IO_old_proc_close (fp) - _IO_FILE *fp; +_IO_old_proc_close (_IO_FILE *fp) { /* This is not name-space clean. FIXME! */ int wstatus; diff --git a/libio/oldpclose.c b/libio/oldpclose.c index cafa405110..2f29490876 100644 --- a/libio/oldpclose.c +++ b/libio/oldpclose.c @@ -34,8 +34,7 @@ int attribute_compat_text_section -__old_pclose (fp) - FILE *fp; +__old_pclose (FILE *fp) { #if 0 /* Does not actually test that stream was created by popen(). Instead, diff --git a/libio/pclose.c b/libio/pclose.c index 019b74d9d1..e79860ef94 100644 --- a/libio/pclose.c +++ b/libio/pclose.c @@ -30,8 +30,7 @@ #include <shlib-compat.h> int -__new_pclose (fp) - FILE *fp; +__new_pclose (FILE *fp) { #if 0 /* Does not actually test that stream was created by popen(). Instead, diff --git a/libio/peekc.c b/libio/peekc.c index c7b443bb1f..af3b909e16 100644 --- a/libio/peekc.c +++ b/libio/peekc.c @@ -30,8 +30,7 @@ #undef _IO_peekc int -_IO_peekc_locked (fp) - _IO_FILE *fp; +_IO_peekc_locked (_IO_FILE *fp) { int result; CHECK_FILE (fp, EOF); diff --git a/libio/putc.c b/libio/putc.c index 46140de1e6..fa0d72c666 100644 --- a/libio/putc.c +++ b/libio/putc.c @@ -21,9 +21,7 @@ #undef _IO_putc int -_IO_putc (c, fp) - int c; - _IO_FILE *fp; +_IO_putc (int c, _IO_FILE *fp) { int result; CHECK_FILE (fp, EOF); diff --git a/libio/putc_u.c b/libio/putc_u.c index e97a78e40c..80636dc110 100644 --- a/libio/putc_u.c +++ b/libio/putc_u.c @@ -21,9 +21,7 @@ #undef putc_unlocked int -putc_unlocked (c, fp) - int c; - _IO_FILE *fp; +putc_unlocked (int c, _IO_FILE *fp) { CHECK_FILE (fp, EOF); return _IO_putc_unlocked (c, fp); diff --git a/libio/putchar.c b/libio/putchar.c index d401d2b6c9..ca8910a902 100644 --- a/libio/putchar.c +++ b/libio/putchar.c @@ -21,8 +21,7 @@ #undef putchar int -putchar (c) - int c; +putchar (int c) { int result; _IO_acquire_lock (_IO_stdout); diff --git a/libio/putchar_u.c b/libio/putchar_u.c index 2fd767b717..2b905723a0 100644 --- a/libio/putchar_u.c +++ b/libio/putchar_u.c @@ -21,8 +21,7 @@ #undef putchar_unlocked int -putchar_unlocked (c) - int c; +putchar_unlocked (int c) { CHECK_FILE (_IO_stdout, EOF); return _IO_putc_unlocked (c, _IO_stdout); diff --git a/libio/putwc.c b/libio/putwc.c index b441f24699..91e1b07041 100644 --- a/libio/putwc.c +++ b/libio/putwc.c @@ -19,9 +19,7 @@ #include <wchar.h> wint_t -putwc (wc, fp) - wchar_t wc; - _IO_FILE *fp; +putwc (wchar_t wc, _IO_FILE *fp) { wint_t result; CHECK_FILE (fp, WEOF); diff --git a/libio/putwc_u.c b/libio/putwc_u.c index e2f59ec2b5..0079f142f1 100644 --- a/libio/putwc_u.c +++ b/libio/putwc_u.c @@ -19,9 +19,7 @@ #include <wchar.h> wint_t -putwc_unlocked (wc, fp) - wchar_t wc; - _IO_FILE *fp; +putwc_unlocked (wchar_t wc, _IO_FILE *fp) { CHECK_FILE (fp, WEOF); return _IO_putwc_unlocked (wc, fp); diff --git a/libio/putwchar.c b/libio/putwchar.c index 41d834b144..0fefe3a3ac 100644 --- a/libio/putwchar.c +++ b/libio/putwchar.c @@ -19,8 +19,7 @@ #include <wchar.h> wint_t -putwchar (wc) - wchar_t wc; +putwchar (wchar_t wc) { wint_t result; _IO_acquire_lock (_IO_stdout); diff --git a/libio/putwchar_u.c b/libio/putwchar_u.c index dec9e38c7d..792aec4b44 100644 --- a/libio/putwchar_u.c +++ b/libio/putwchar_u.c @@ -19,8 +19,7 @@ #include <wchar.h> wint_t -putwchar_unlocked (wc) - wchar_t wc; +putwchar_unlocked (wchar_t wc) { CHECK_FILE (_IO_stdout, WEOF); return _IO_putwc_unlocked (wc, _IO_stdout); diff --git a/libio/rewind.c b/libio/rewind.c index baa804a05e..5a19106db8 100644 --- a/libio/rewind.c +++ b/libio/rewind.c @@ -28,8 +28,7 @@ #include <stdio.h> void -rewind (fp) - _IO_FILE *fp; +rewind (_IO_FILE *fp) { CHECK_FILE (fp, ); _IO_acquire_lock (fp); diff --git a/libio/setbuf.c b/libio/setbuf.c index a418bc1f32..251b487958 100644 --- a/libio/setbuf.c +++ b/libio/setbuf.c @@ -28,9 +28,7 @@ #include "stdio.h" void -setbuf (fp, buf) - _IO_FILE *fp; - char *buf; +setbuf (_IO_FILE *fp, char *buf) { _IO_setbuffer (fp, buf, _IO_BUFSIZ); } diff --git a/libio/setlinebuf.c b/libio/setlinebuf.c index 482f0af935..ea763cf26a 100644 --- a/libio/setlinebuf.c +++ b/libio/setlinebuf.c @@ -30,8 +30,7 @@ #undef setlinebuf void -setlinebuf (stream) - _IO_FILE *stream; +setlinebuf (_IO_FILE *stream) { _IO_setvbuf (stream, NULL, 1, 0); } diff --git a/libio/vasprintf.c b/libio/vasprintf.c index 7f9c1050ff..61cdfdd0e2 100644 --- a/libio/vasprintf.c +++ b/libio/vasprintf.c @@ -32,10 +32,7 @@ #include "strfile.h" int -_IO_vasprintf (result_ptr, format, args) - char **result_ptr; - const char *format; - _IO_va_list args; +_IO_vasprintf (char **result_ptr, const char *format, _IO_va_list args) { /* Initial size of the buffer to be used. Will be doubled each time an overflow occurs. */ diff --git a/libio/vscanf.c b/libio/vscanf.c index 5a17c1d419..223f84f9c5 100644 --- a/libio/vscanf.c +++ b/libio/vscanf.c @@ -30,9 +30,7 @@ #undef vscanf int -_IO_vscanf (format, args) - const char *format; - _IO_va_list args; +_IO_vscanf (const char *format, _IO_va_list args) { return _IO_vfscanf (_IO_stdin, format, args, NULL); } diff --git a/libio/vsnprintf.c b/libio/vsnprintf.c index e2752d8d84..fdceb3d786 100644 --- a/libio/vsnprintf.c +++ b/libio/vsnprintf.c @@ -30,9 +30,7 @@ static int _IO_strn_overflow (_IO_FILE *fp, int c) __THROW; static int -_IO_strn_overflow (fp, c) - _IO_FILE *fp; - int c; +_IO_strn_overflow (_IO_FILE *fp, int c) { /* When we come to here this means the user supplied buffer is filled. But since we must return the number of characters which diff --git a/libio/vswprintf.c b/libio/vswprintf.c index c10e586b35..1533a6d02d 100644 --- a/libio/vswprintf.c +++ b/libio/vswprintf.c @@ -31,9 +31,7 @@ static wint_t _IO_wstrn_overflow (_IO_FILE *fp, wint_t c) __THROW; static wint_t -_IO_wstrn_overflow (fp, c) - _IO_FILE *fp; - wint_t c; +_IO_wstrn_overflow (_IO_FILE *fp, wint_t c) { /* When we come to here this means the user supplied buffer is filled. But since we must return the number of characters which diff --git a/libio/wfiledoalloc.c b/libio/wfiledoalloc.c index 4acf3f8fc7..dc71092433 100644 --- a/libio/wfiledoalloc.c +++ b/libio/wfiledoalloc.c @@ -78,8 +78,7 @@ */ int -_IO_wfile_doallocate (fp) - _IO_FILE *fp; +_IO_wfile_doallocate (_IO_FILE *fp) { _IO_size_t size; wchar_t *p; diff --git a/libio/wgenops.c b/libio/wgenops.c index e7d2d1ca55..e038f2c8bf 100644 --- a/libio/wgenops.c +++ b/libio/wgenops.c @@ -48,9 +48,7 @@ static int save_for_wbackup (_IO_FILE *fp, wchar_t *end_p) __THROW /* Return minimum _pos markers Assumes the current get area is the main get area. */ _IO_ssize_t -_IO_least_wmarker (fp, end_p) - _IO_FILE *fp; - wchar_t *end_p; +_IO_least_wmarker (_IO_FILE *fp, wchar_t *end_p) { _IO_ssize_t least_so_far = end_p - fp->_wide_data->_IO_read_base; struct _IO_marker *mark; @@ -63,8 +61,7 @@ libc_hidden_def (_IO_least_wmarker) /* Switch current get area from backup buffer to (start of) main get area. */ void -_IO_switch_to_main_wget_area (fp) - _IO_FILE *fp; +_IO_switch_to_main_wget_area (_IO_FILE *fp) { wchar_t *tmp; fp->_flags &= ~_IO_IN_BACKUP; @@ -84,8 +81,7 @@ libc_hidden_def (_IO_switch_to_main_wget_area) /* Switch current get area from main get area to (end of) backup area. */ void -_IO_switch_to_wbackup_area (fp) - _IO_FILE *fp; +_IO_switch_to_wbackup_area (_IO_FILE *fp) { wchar_t *tmp; fp->_flags |= _IO_IN_BACKUP; @@ -104,11 +100,7 @@ libc_hidden_def (_IO_switch_to_wbackup_area) void -_IO_wsetb (f, b, eb, a) - _IO_FILE *f; - wchar_t *b; - wchar_t *eb; - int a; +_IO_wsetb (_IO_FILE *f, wchar_t *b, wchar_t *eb, int a) { if (f->_wide_data->_IO_buf_base && !(f->_flags2 & _IO_FLAGS2_USER_WBUF)) free (f->_wide_data->_IO_buf_base); @@ -123,9 +115,7 @@ libc_hidden_def (_IO_wsetb) wint_t -_IO_wdefault_pbackfail (fp, c) - _IO_FILE *fp; - wint_t c; +_IO_wdefault_pbackfail (_IO_FILE *fp, wint_t c) { if (fp->_wide_data->_IO_read_ptr > fp->_wide_data->_IO_read_base && !_IO_in_backup (fp) @@ -188,9 +178,7 @@ libc_hidden_def (_IO_wdefault_pbackfail) void -_IO_wdefault_finish (fp, dummy) - _IO_FILE *fp; - int dummy; +_IO_wdefault_finish (_IO_FILE *fp, int dummy) { struct _IO_marker *mark; if (fp->_wide_data->_IO_buf_base && !(fp->_flags2 & _IO_FLAGS2_USER_WBUF)) @@ -219,8 +207,7 @@ libc_hidden_def (_IO_wdefault_finish) wint_t -_IO_wdefault_uflow (fp) - _IO_FILE *fp; +_IO_wdefault_uflow (_IO_FILE *fp) { wint_t wch; wch = _IO_UNDERFLOW (fp); @@ -232,9 +219,7 @@ libc_hidden_def (_IO_wdefault_uflow) wint_t -__woverflow (f, wch) - _IO_FILE *f; - wint_t wch; +__woverflow (_IO_FILE *f, wint_t wch) { if (f->_mode == 0) _IO_fwide (f, 1); @@ -244,8 +229,7 @@ libc_hidden_def (__woverflow) wint_t -__wuflow (fp) - _IO_FILE *fp; +__wuflow (_IO_FILE *fp) { if (fp->_mode < 0 || (fp->_mode == 0 && _IO_fwide (fp, 1) != 1)) return WEOF; @@ -275,8 +259,7 @@ __wuflow (fp) libc_hidden_def (__wuflow) wint_t -__wunderflow (fp) - _IO_FILE *fp; +__wunderflow (_IO_FILE *fp) { if (fp->_mode < 0 || (fp->_mode == 0 && _IO_fwide (fp, 1) != 1)) return WEOF; @@ -307,10 +290,7 @@ libc_hidden_def (__wunderflow) _IO_size_t -_IO_wdefault_xsputn (f, data, n) - _IO_FILE *f; - const void *data; - _IO_size_t n; +_IO_wdefault_xsputn (_IO_FILE *f, const void *data, _IO_size_t n) { const wchar_t *s = (const wchar_t *) data; _IO_size_t more = n; @@ -358,10 +338,7 @@ libc_hidden_def (_IO_wdefault_xsputn) _IO_size_t -_IO_wdefault_xsgetn (fp, data, n) - _IO_FILE *fp; - void *data; - _IO_size_t n; +_IO_wdefault_xsgetn (_IO_FILE *fp, void *data, _IO_size_t n) { _IO_size_t more = n; wchar_t *s = (wchar_t*) data; @@ -405,8 +382,7 @@ libc_hidden_def (_IO_wdefault_xsgetn) void -_IO_wdoallocbuf (fp) - _IO_FILE *fp; +_IO_wdoallocbuf (_IO_FILE *fp) { if (fp->_wide_data->_IO_buf_base) return; @@ -420,8 +396,7 @@ libc_hidden_def (_IO_wdoallocbuf) int -_IO_wdefault_doallocate (fp) - _IO_FILE *fp; +_IO_wdefault_doallocate (_IO_FILE *fp) { wchar_t *buf; @@ -435,8 +410,7 @@ libc_hidden_def (_IO_wdefault_doallocate) int -_IO_switch_to_wget_mode (fp) - _IO_FILE *fp; +_IO_switch_to_wget_mode (_IO_FILE *fp) { if (fp->_wide_data->_IO_write_ptr > fp->_wide_data->_IO_write_base) if ((wint_t)_IO_WOVERFLOW (fp, WEOF) == WEOF) @@ -460,8 +434,7 @@ _IO_switch_to_wget_mode (fp) libc_hidden_def (_IO_switch_to_wget_mode) void -_IO_free_wbackup_area (fp) - _IO_FILE *fp; +_IO_free_wbackup_area (_IO_FILE *fp) { if (_IO_in_backup (fp)) _IO_switch_to_main_wget_area (fp); /* Just in case. */ @@ -474,8 +447,7 @@ libc_hidden_def (_IO_free_wbackup_area) #if 0 int -_IO_switch_to_wput_mode (fp) - _IO_FILE *fp; +_IO_switch_to_wput_mode (_IO_FILE *fp) { fp->_wide_data->_IO_write_base = fp->_wide_data->_IO_read_ptr; fp->_wide_data->_IO_write_ptr = fp->_wide_data->_IO_read_ptr; @@ -594,9 +566,7 @@ save_for_wbackup (fp, end_p) } wint_t -_IO_sputbackwc (fp, c) - _IO_FILE *fp; - wint_t c; +_IO_sputbackwc (_IO_FILE *fp, wint_t c) { wint_t result; @@ -617,8 +587,7 @@ _IO_sputbackwc (fp, c) libc_hidden_def (_IO_sputbackwc) wint_t -_IO_sungetwc (fp) - _IO_FILE *fp; +_IO_sungetwc (_IO_FILE *fp) { wint_t result; @@ -638,10 +607,7 @@ _IO_sungetwc (fp) unsigned -_IO_adjust_wcolumn (start, line, count) - unsigned start; - const wchar_t *line; - int count; +_IO_adjust_wcolumn (unsigned start, const wchar_t *line, int count) { const wchar_t *ptr = line + count; while (ptr > line) @@ -651,9 +617,7 @@ _IO_adjust_wcolumn (start, line, count) } void -_IO_init_wmarker (marker, fp) - struct _IO_marker *marker; - _IO_FILE *fp; +_IO_init_wmarker (struct _IO_marker *marker, _IO_FILE *fp) { marker->_sbuf = fp; if (_IO_in_put_mode (fp)) @@ -673,8 +637,7 @@ _IO_init_wmarker (marker, fp) /* Return difference between MARK and current position of MARK's stream. */ int -_IO_wmarker_delta (mark) - struct _IO_marker *mark; +_IO_wmarker_delta (struct _IO_marker *mark) { int cur_pos; if (mark->_sbuf == NULL) @@ -689,10 +652,7 @@ _IO_wmarker_delta (mark) } int -_IO_seekwmark (fp, mark, delta) - _IO_FILE *fp; - struct _IO_marker *mark; - int delta; +_IO_seekwmark (_IO_FILE *fp, struct _IO_marker *mark, int delta) { if (mark->_sbuf != fp) return EOF; @@ -713,8 +673,7 @@ _IO_seekwmark (fp, mark, delta) } void -_IO_unsave_wmarkers (fp) - _IO_FILE *fp; +_IO_unsave_wmarkers (_IO_FILE *fp) { struct _IO_marker *mark = fp->_markers; if (mark) diff --git a/libio/wmemstream.c b/libio/wmemstream.c index 61b5d8b346..f20c9a3b94 100644 --- a/libio/wmemstream.c +++ b/libio/wmemstream.c @@ -62,9 +62,7 @@ static const struct _IO_jump_t _IO_wmem_jumps = necessary. *BUFLOC and *SIZELOC are updated with the buffer's location and the number of characters written on fflush or fclose. */ _IO_FILE * -open_wmemstream (bufloc, sizeloc) - wchar_t **bufloc; - _IO_size_t *sizeloc; +open_wmemstream (wchar_t **bufloc, _IO_size_t *sizeloc) { struct locked_FILE { @@ -105,8 +103,7 @@ open_wmemstream (bufloc, sizeloc) static int -_IO_wmem_sync (fp) - _IO_FILE* fp; +_IO_wmem_sync (_IO_FILE *fp) { struct _IO_FILE_wmemstream *mp = (struct _IO_FILE_wmemstream *) fp; @@ -127,9 +124,7 @@ _IO_wmem_sync (fp) static void -_IO_wmem_finish (fp, dummy) - _IO_FILE* fp; - int dummy; +_IO_wmem_finish (_IO_FILE *fp, int dummy) { struct _IO_FILE_wmemstream *mp = (struct _IO_FILE_wmemstream *) fp; |