* libio/libio.h (struct _IO_cookie_file): Move struct type defintion out.
(_IO_FILE): Declare chain as (struct _IO_FILE_plus *).
* libio/libioP.h (struct _IO_cookie_file): Move struct type defintion in.
(_IO_JUMPS): Don't cast THIS--expect arg to be a (struct _IO_FILE_plus *).
(_IO_JUMPS_FUNC): Express in terms of _IO_JUMPS, and add cast to
THIS, since _IO_JUMPS no longer does it implicitly.
(_IO_file_init, _IO_old_file_init, _IO_new_file_init): Declare
arg type as (struct _IO_FILE_plus *).
(_IO_str_init_static, _IO_str_init_readonly): Declare 1st
arg as (_IO_strfile *).
* libio/strops.c (_IO_str_init_static, _IO_str_init_readonly):
Declare 1st arg as (_IO_strfile *).
* libio/fileops.c (_IO_new_file_init): Declare
arg type as (struct _IO_FILE_plus *).
* libio/oldfileops.c (_IO_old_file_init): Likewise.
* libio/genops.c (_IO_link_in, _IO_un_link): Likewise.
(_IO_flush_all, _IO_flush_all_linebuffered, _IO_unbuffer_write):
Declare iteration pointer as (struct _IO_FILE_plus *).
(_IO_iter_next, _IO_iter_file): _IO_ITER is now (struct _IO_FILE_plus *).
* libio/stdfiles.c (_IO_list_all): Declare as (struct _IO_FILE_plus *).
* libio/oldstdfiles.c (_IO_list_all): Likewise.
(_IO_check_libio): Set user-visible handles to (struct _IO_FILE_plus *).
* libio/stdio.c (stdin, stdout, stderr): Set user-visible handles
to (struct _IO_FILE_plus *).
* libio/iofdopen.c (_IO_new_fdopen): Pass FILE handle pointer
whose high bound includes vtable to all functions that will use
vtable. For streambufs, pass pointer whose bounds include struct
_IO_strfile.
* libio/wgenops.c (_IO_wdefault_finish): Likewise.
* libio/oldiofdopen.c (_IO_old_fdopen): Likewise.
* libio/iofopen.c (_IO_new_fopen): Likewise.
* libio/oldiofopen.c (_IO_old_fopen): Likewise.
* libio/iofopen64.c (_IO_fopen64): Likewise.
* libio/iopopen.c (_IO_new_popen): Likewise.
* libio/oldiopopen.c (_IO_old_popen): Likewise.
* libio/memstream.c (open_memstream): Likewise.
* libio/iovsscanf.c (_IO_vsscanf): Likewise.
* libio/iovsprintf.c (_IO_vsprintf): Likewise.
* libio/iovdprintf.c (_IO_vdprintf): Likewise.
* libio/iofopncook.c (_IO_cookie_init): Likewise.
* libio/obprintf.c (_IO_obstack_vprintf): Likewise.
* libio/vasprintf.c (_IO_vasprintf): Likewise.
* libio/vsnprintf.c (_IO_vsnprintf): Likewise.
* libio/stdfiles.c (_IO_stdout_, _IO_stderr_): Likewise.
* libio/oldstdfiles.c (_IO_stdout_, _IO_stderr_): Likewise.
* stdlib/strfmon.c (__strfmon_l): Likewise.
* stdio-common/vfprintf.c (buffered_vfprintf): Likewise.
(vfprintf): Qualify computed-goto targets as unbounded.
2000-06-28 Greg McGary <greg@mcgary.org>
* libio/libio.h (struct _IO_cookie_file): Move struct type defintion out.
(_IO_FILE): Declare chain as (struct _IO_FILE_plus *).
* libio/libioP.h (struct _IO_cookie_file): Move struct type defintion in.
(_IO_JUMPS): Don't cast THIS--expect arg to be a (struct _IO_FILE_plus *).
(_IO_JUMPS_FUNC): Express in terms of _IO_JUMPS, and add cast to
THIS, since _IO_JUMPS no longer does it implicitly.
(_IO_file_init, _IO_old_file_init, _IO_new_file_init): Declare
arg type as (struct _IO_FILE_plus *).
(_IO_str_init_static, _IO_str_init_readonly): Declare 1st
arg as (_IO_strfile *).
* libio/strops.c (_IO_str_init_static, _IO_str_init_readonly):
Declare 1st arg as (_IO_strfile *).
* libio/fileops.c (_IO_new_file_init): Declare
arg type as (struct _IO_FILE_plus *).
* libio/oldfileops.c (_IO_old_file_init): Likewise.
* libio/genops.c (_IO_link_in, _IO_un_link): Likewise.
(_IO_flush_all, _IO_flush_all_linebuffered, _IO_unbuffer_write):
Declare iteration pointer as (struct _IO_FILE_plus *).
(_IO_iter_next, _IO_iter_file): _IO_ITER is now (struct _IO_FILE_plus *).
* libio/stdfiles.c (_IO_list_all): Declare as (struct _IO_FILE_plus *).
* libio/oldstdfiles.c (_IO_list_all): Likewise.
(_IO_check_libio): Set user-visible handles to (struct _IO_FILE_plus *).
* libio/stdio.c (stdin, stdout, stderr): Set user-visible handles
to (struct _IO_FILE_plus *).
* libio/iofdopen.c (_IO_new_fdopen): Pass FILE handle pointer
whose high bound includes vtable to all functions that will use
vtable. For streambufs, pass pointer whose bounds include struct
_IO_strfile.
* libio/wgenops.c (_IO_wdefault_finish): Likewise.
* libio/oldiofdopen.c (_IO_old_fdopen): Likewise.
* libio/iofopen.c (_IO_new_fopen): Likewise.
* libio/oldiofopen.c (_IO_old_fopen): Likewise.
* libio/iofopen64.c (_IO_fopen64): Likewise.
* libio/iopopen.c (_IO_new_popen): Likewise.
* libio/oldiopopen.c (_IO_old_popen): Likewise.
* libio/memstream.c (open_memstream): Likewise.
* libio/iovsscanf.c (_IO_vsscanf): Likewise.
* libio/iovsprintf.c (_IO_vsprintf): Likewise.
* libio/iovdprintf.c (_IO_vdprintf): Likewise.
* libio/iofopncook.c (_IO_cookie_init): Likewise.
* libio/obprintf.c (_IO_obstack_vprintf): Likewise.
* libio/vasprintf.c (_IO_vasprintf): Likewise.
* libio/vsnprintf.c (_IO_vsnprintf): Likewise.
* libio/stdfiles.c (_IO_stdout_, _IO_stderr_): Likewise.
* libio/oldstdfiles.c (_IO_stdout_, _IO_stderr_): Likewise.
* stdlib/strfmon.c (__strfmon_l): Likewise.
* stdio-common/vfprintf.c (buffered_vfprintf): Likewise.
(vfprintf): Qualify computed-goto targets as unbounded.
+2000-06-28 Greg McGary <greg@mcgary.org>
+
+ * libio/libio.h (struct _IO_cookie_file): Move struct type defintion out.
+ (_IO_FILE): Declare chain as (struct _IO_FILE_plus *).
+ * libio/libioP.h (struct _IO_cookie_file): Move struct type defintion in.
+ (_IO_JUMPS): Don't cast THIS--expect arg to be a (struct _IO_FILE_plus *).
+ (_IO_JUMPS_FUNC): Express in terms of _IO_JUMPS, and add cast to
+ THIS, since _IO_JUMPS no longer does it implicitly.
+ (_IO_file_init, _IO_old_file_init, _IO_new_file_init): Declare
+ arg type as (struct _IO_FILE_plus *).
+ (_IO_str_init_static, _IO_str_init_readonly): Declare 1st
+ arg as (_IO_strfile *).
+ * libio/strops.c (_IO_str_init_static, _IO_str_init_readonly):
+ Declare 1st arg as (_IO_strfile *).
+ * libio/fileops.c (_IO_new_file_init): Declare
+ arg type as (struct _IO_FILE_plus *).
+ * libio/oldfileops.c (_IO_old_file_init): Likewise.
+ * libio/genops.c (_IO_link_in, _IO_un_link): Likewise.
+ (_IO_flush_all, _IO_flush_all_linebuffered, _IO_unbuffer_write):
+ Declare iteration pointer as (struct _IO_FILE_plus *).
+ (_IO_iter_next, _IO_iter_file): _IO_ITER is now (struct _IO_FILE_plus *).
+ * libio/stdfiles.c (_IO_list_all): Declare as (struct _IO_FILE_plus *).
+ * libio/oldstdfiles.c (_IO_list_all): Likewise.
+ (_IO_check_libio): Set user-visible handles to (struct _IO_FILE_plus *).
+ * libio/stdio.c (stdin, stdout, stderr): Set user-visible handles
+ to (struct _IO_FILE_plus *).
+
+ * libio/iofdopen.c (_IO_new_fdopen): Pass FILE handle pointer
+ whose high bound includes vtable to all functions that will use
+ vtable. For streambufs, pass pointer whose bounds include struct
+ _IO_strfile.
+ * libio/wgenops.c (_IO_wdefault_finish): Likewise.
+ * libio/oldiofdopen.c (_IO_old_fdopen): Likewise.
+ * libio/iofopen.c (_IO_new_fopen): Likewise.
+ * libio/oldiofopen.c (_IO_old_fopen): Likewise.
+ * libio/iofopen64.c (_IO_fopen64): Likewise.
+ * libio/iopopen.c (_IO_new_popen): Likewise.
+ * libio/oldiopopen.c (_IO_old_popen): Likewise.
+ * libio/memstream.c (open_memstream): Likewise.
+ * libio/iovsscanf.c (_IO_vsscanf): Likewise.
+ * libio/iovsprintf.c (_IO_vsprintf): Likewise.
+ * libio/iovdprintf.c (_IO_vdprintf): Likewise.
+ * libio/iofopncook.c (_IO_cookie_init): Likewise.
+ * libio/obprintf.c (_IO_obstack_vprintf): Likewise.
+ * libio/vasprintf.c (_IO_vasprintf): Likewise.
+ * libio/vsnprintf.c (_IO_vsnprintf): Likewise.
+ * libio/stdfiles.c (_IO_stdout_, _IO_stderr_): Likewise.
+ * libio/oldstdfiles.c (_IO_stdout_, _IO_stderr_): Likewise.
+ * stdlib/strfmon.c (__strfmon_l): Likewise.
+ * stdio-common/vfprintf.c (buffered_vfprintf): Likewise.
+ (vfprintf): Qualify computed-goto targets as unbounded.
+
2000-06-28 Ulrich Drepper <drepper@redhat.com>
* stdio-common/vfscanf.c: Finally handle multibyte decimal point and
void
_IO_new_file_init (fp)
- _IO_FILE *fp;
+ 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
position before we do the first fseek (and until a following fflush). */
- fp->_offset = _IO_pos_BAD;
- fp->_IO_file_flags |= CLOSED_FILEBUF_FLAGS;
+ fp->file._offset = _IO_pos_BAD;
+ fp->file._IO_file_flags |= CLOSED_FILEBUF_FLAGS;
- _IO_link_in(fp);
- fp->_fileno = -1;
+ _IO_link_in (fp);
+ fp->file._fileno = -1;
}
int
_IO_wsetp (fp, NULL, NULL);
}
- _IO_un_link (fp);
+ _IO_un_link ((struct _IO_FILE_plus *) fp);
fp->_flags = _IO_MAGIC|CLOSED_FILEBUF_FLAGS;
fp->_fileno = -1;
fp->_offset = _IO_pos_BAD;
if (_IO_SEEKOFF (fp, (_IO_off64_t)0, _IO_seek_end, _IOS_INPUT|_IOS_OUTPUT)
== _IO_pos_BAD && errno != ESPIPE)
return NULL;
- _IO_link_in (fp);
+ _IO_link_in ((struct _IO_FILE_plus *) fp);
return fp;
}
void
_IO_un_link (fp)
- _IO_FILE *fp;
+ struct _IO_FILE_plus *fp;
{
- if (fp->_flags & _IO_LINKED)
+ if (fp->file._flags & _IO_LINKED)
{
- _IO_FILE **f;
+ struct _IO_FILE_plus **f;
#ifdef _IO_MTSAFE_IO
_IO_lock_lock (list_all_lock);
#endif
- for (f = &_IO_list_all; *f != NULL; f = &(*f)->_chain)
+ for (f = &_IO_list_all; *f != NULL; f = &(*f)->file._chain)
{
if (*f == fp)
{
- *f = fp->_chain;
+ *f = fp->file._chain;
break;
}
}
#ifdef _IO_MTSAFE_IO
_IO_lock_unlock (list_all_lock);
#endif
- fp->_flags &= ~_IO_LINKED;
+ fp->file._flags &= ~_IO_LINKED;
}
}
void
_IO_link_in (fp)
- _IO_FILE *fp;
+ struct _IO_FILE_plus *fp;
{
- if ((fp->_flags & _IO_LINKED) == 0)
+ if ((fp->file._flags & _IO_LINKED) == 0)
{
- fp->_flags |= _IO_LINKED;
+ fp->file._flags |= _IO_LINKED;
#ifdef _IO_MTSAFE_IO
_IO_lock_lock (list_all_lock);
#endif
- fp->_chain = _IO_list_all;
+ fp->file._chain = _IO_list_all;
_IO_list_all = fp;
#ifdef _IO_MTSAFE_IO
_IO_lock_unlock (list_all_lock);
_IO_lock_fini (*fp->_lock);
#endif
- _IO_un_link (fp);
+ _IO_un_link ((struct _IO_FILE_plus *) fp);
}
_IO_off64_t
_IO_flush_all ()
{
int result = 0;
- _IO_FILE *fp;
- for (fp = _IO_list_all; fp != NULL; fp = fp->_chain)
- if (((fp->_mode < 0 && fp->_IO_write_ptr > fp->_IO_write_base)
- || (fp->_vtable_offset == 0
- && fp->_mode > 0 && (fp->_wide_data->_IO_write_ptr
- > fp->_wide_data->_IO_write_base)))
- && _IO_OVERFLOW (fp, EOF) == EOF)
+ struct _IO_FILE_plus *fp;
+ for (fp = _IO_list_all; fp != NULL; fp = fp->file._chain)
+ if (((fp->file._mode < 0 && fp->file._IO_write_ptr > fp->file._IO_write_base)
+ || (fp->file._vtable_offset == 0
+ && fp->file._mode > 0 && (fp->file._wide_data->_IO_write_ptr
+ > fp->file._wide_data->_IO_write_base)))
+ && _IO_OVERFLOW (&fp->file, EOF) == EOF)
result = EOF;
return result;
}
void
_IO_flush_all_linebuffered ()
{
- _IO_FILE *fp;
- for (fp = _IO_list_all; fp != NULL; fp = fp->_chain)
- if ((fp->_flags & _IO_NO_WRITES) == 0 && fp->_flags & _IO_LINE_BUF)
- _IO_OVERFLOW (fp, EOF);
+ struct _IO_FILE_plus *fp;
+ for (fp = _IO_list_all; fp != NULL; fp = fp->file._chain)
+ if ((fp->file._flags & _IO_NO_WRITES) == 0 && fp->file._flags & _IO_LINE_BUF)
+ _IO_OVERFLOW (&fp->file, EOF);
}
static void _IO_unbuffer_write __P ((void));
static void
_IO_unbuffer_write ()
{
- _IO_FILE *fp;
- for (fp = _IO_list_all; fp != NULL; fp = fp->_chain)
- if (! (fp->_flags & _IO_UNBUFFERED)
- && (! (fp->_flags & _IO_NO_WRITES)
- || (fp->_flags & _IO_IS_APPENDING)))
- _IO_SETBUF (fp, NULL, 0);
+ struct _IO_FILE_plus *fp;
+ for (fp = _IO_list_all; fp != NULL; fp = fp->file._chain)
+ if (! (fp->file._flags & _IO_UNBUFFERED)
+ && (! (fp->file._flags & _IO_NO_WRITES)
+ || (fp->file._flags & _IO_IS_APPENDING)))
+ _IO_SETBUF (&fp->file, NULL, 0);
}
int
_IO_ITER
_IO_iter_end()
{
- return NULL;
+ return NULL;
}
_IO_ITER
_IO_iter_next(iter)
_IO_ITER iter;
{
- return iter->_chain;
+ return iter->file._chain;
}
_IO_FILE *
_IO_iter_file(iter)
_IO_ITER iter;
{
- return iter;
+ return (_IO_FILE *) iter;
}
void
#endif
_IO_no_init (&new_f->fp.file, 0, 0, &new_f->wd, &_IO_wfile_jumps);
_IO_JUMPS (&new_f->fp) = &_IO_file_jumps;
- _IO_file_init (&new_f->fp.file);
+ _IO_file_init (&new_f->fp);
#if !_IO_UNIFIED_JUMPTABLES
new_f->fp.vtable = NULL;
#endif
if (_IO_file_attach (&new_f->fp.file, fd) == NULL)
{
- _IO_un_link (&new_f->fp.file);
+ _IO_un_link (&new_f->fp);
free (new_f);
return NULL;
}
_IO_mask_flags (&new_f->fp.file, read_write,
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
- return &new_f->fp.file;
+ return (_IO_FILE *) &new_f->fp;
}
strong_alias (_IO_new_fdopen, __new_fdopen)
#endif
_IO_no_init (&new_f->fp.file, 0, 0, &new_f->wd, &_IO_wfile_jumps);
_IO_JUMPS (&new_f->fp) = &_IO_file_jumps;
- _IO_file_init (&new_f->fp.file);
+ _IO_file_init (&new_f->fp);
#if !_IO_UNIFIED_JUMPTABLES
new_f->fp.vtable = NULL;
#endif
- if (_IO_file_fopen (&new_f->fp.file, filename, mode, 1) != NULL)
+ if (_IO_file_fopen ((_IO_FILE *) new_f, filename, mode, 1) != NULL)
return (_IO_FILE *) &new_f->fp;
- _IO_un_link (&new_f->fp.file);
+ _IO_un_link (&new_f->fp);
free (new_f);
return NULL;
}
-/* Copyright (C) 1993, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1997, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
#endif
_IO_no_init (&new_f->fp.file, 0, 0, &new_f->wd, &_IO_wfile_jumps);
_IO_JUMPS (&new_f->fp) = &_IO_file_jumps;
- _IO_file_init (&new_f->fp.file);
+ _IO_file_init (&new_f->fp);
#if !_IO_UNIFIED_JUMPTABLES
new_f->fp.vtable = NULL;
#endif
- if (_IO_file_fopen (&new_f->fp.file, filename, mode, 0) != NULL)
- return &new_f->fp.file;
- _IO_un_link (&new_f->fp.file);
+ if (_IO_file_fopen ((_IO_FILE *) new_f, filename, mode, 0) != NULL)
+ return (_IO_FILE *) &new_f->fp;
+ _IO_un_link (&new_f->fp);
free (new_f);
return NULL;
#else
_IO_cookie_init (struct _IO_cookie_file *cfile, int read_write,
void *cookie, _IO_cookie_io_functions_t io_functions)
{
- _IO_init (&cfile->__file, 0);
- _IO_JUMPS (&cfile->__file) = &_IO_cookie_jumps;
+ _IO_init (&cfile->__fp.file, 0);
+ _IO_JUMPS (&cfile->__fp) = &_IO_cookie_jumps;
cfile->__cookie = cookie;
cfile->__io_functions = io_functions;
- _IO_file_init(&cfile->__file);
+ _IO_file_init(&cfile->__fp);
- cfile->__file._IO_file_flags =
- _IO_mask_flags (&cfile->__file, read_write,
+ cfile->__fp.file._IO_file_flags =
+ _IO_mask_flags (&cfile->__fp.file, read_write,
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
/* We use a negative number different from -1 for _fileno to mark that
this special stream is not associated with a real file, but still has
to be treated as such. */
- cfile->__file._fileno = -2;
+ cfile->__fp.file._fileno = -2;
}
if (new_f == NULL)
return NULL;
#ifdef _IO_MTSAFE_IO
- new_f->cfile.__file._lock = &new_f->lock;
+ new_f->cfile.__fp.file._lock = &new_f->lock;
#endif
_IO_cookie_init (&new_f->cfile, read_write, cookie, io_functions);
- return &new_f->cfile.__file;
+ return (_IO_FILE *) &new_f->cfile.__fp;
}
versioned_symbol (libc, _IO_fopencookie, fopencookie, GLIBC_2_2);
ret = _IO_fopencookie (cookie, mode, io_functions);
if (ret != NULL)
- _IO_JUMPS (ret) = &_IO_old_cookie_jumps;
+ _IO_JUMPS ((struct _IO_FILE_plus *) ret) = &_IO_old_cookie_jumps;
return ret;
}
#endif
fp = &new_f->fpx.file.file;
_IO_no_init (fp, 0, 0, &new_f->wd, &_IO_wproc_jumps);
- _IO_JUMPS (fp) = &_IO_proc_jumps;
- _IO_new_file_init (fp);
+ _IO_JUMPS (&new_f->fpx.file) = &_IO_proc_jumps;
+ _IO_new_file_init (&new_f->fpx.file);
#if !_IO_UNIFIED_JUMPTABLES
new_f->fpx.file.vtable = NULL;
#endif
if (_IO_new_proc_open (fp, command, mode) != NULL)
- return fp;
- _IO_un_link (fp);
+ return (_IO_FILE *) &new_f->fpx.file;
+ _IO_un_link (&new_f->fpx.file);
free (new_f);
return NULL;
}
-/* Copyright (C) 1995, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
tmpfil.file._lock = &lock;
#endif
_IO_no_init (&tmpfil.file, 0, 0, &wd, &_IO_wfile_jumps);
- _IO_JUMPS (&tmpfil.file) = &_IO_file_jumps;
- _IO_file_init (&tmpfil.file);
+ _IO_JUMPS (&tmpfil) = &_IO_file_jumps;
+ _IO_file_init (&tmpfil);
#if !_IO_UNIFIED_JUMPTABLES
tmpfil.vtable = NULL;
#endif
if (_IO_file_attach (&tmpfil.file, d) == NULL)
{
- _IO_un_link (&tmpfil.file);
+ _IO_un_link (&tmpfil);
return EOF;
}
tmpfil.file._IO_file_flags =
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING)
| _IO_DELETE_DONT_CLOSE);
- done = _IO_vfprintf (&tmpfil.file, format, arg);
+ done = _IO_vfprintf ((_IO_FILE *) &tmpfil, format, arg);
- _IO_FINISH (&tmpfil.file);
+ _IO_FINISH ((_IO_FILE *) &tmpfil);
return done;
}
-/* Copyright (C) 1993, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
sf._sbf._f._lock = &lock;
#endif
_IO_no_init (&sf._sbf._f, 0, -1, NULL, NULL);
- _IO_JUMPS (&sf._sbf._f) = &_IO_str_jumps;
- _IO_str_init_static (&sf._sbf._f, string, -1, string);
- ret = _IO_vfprintf (&sf._sbf._f, format, args);
- _IO_putc_unlocked ('\0', &sf._sbf._f);
+ _IO_JUMPS ((struct _IO_FILE_plus *) &sf._sbf) = &_IO_str_jumps;
+ _IO_str_init_static (&sf, string, -1, string);
+ ret = _IO_vfprintf ((_IO_FILE *) &sf._sbf, format, args);
+ _IO_putc_unlocked ('\0', (_IO_FILE *) &sf._sbf);
return ret;
}
-/* Copyright (C) 1993, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
sf._sbf._f._lock = &lock;
#endif
_IO_no_init (&sf._sbf._f, 0, -1, NULL, NULL);
- _IO_JUMPS (&sf._sbf._f) = &_IO_str_jumps;
- _IO_str_init_static (&sf._sbf._f, (char*)string, 0, NULL);
- ret = _IO_vfscanf (&sf._sbf._f, format, args, NULL);
+ _IO_JUMPS ((struct _IO_FILE_plus *) &sf._sbf) = &_IO_str_jumps;
+ _IO_str_init_static (&sf, (char*)string, 0, NULL);
+ ret = _IO_vfscanf ((_IO_FILE *) &sf._sbf, format, args, NULL);
return ret;
}
struct _IO_jump_t *_wide_vtable;
};
+struct _IO_FILE_plus;
+
struct _IO_FILE {
int _flags; /* High-order word is _IO_MAGIC; rest is flags. */
#define _IO_file_flags _flags
struct _IO_marker *_markers;
- struct _IO_FILE *_chain;
+ struct _IO_FILE_plus *_chain;
int _fileno;
int _blksize;
typedef struct _IO_FILE _IO_FILE;
#endif
-struct _IO_FILE_plus;
extern struct _IO_FILE_plus _IO_2_1_stdin_;
extern struct _IO_FILE_plus _IO_2_1_stdout_;
extern struct _IO_FILE_plus _IO_2_1_stderr_;
} _IO_cookie_io_functions_t;
typedef _IO_cookie_io_functions_t cookie_io_functions_t;
-/* Special file type for fopencookie function. */
-struct _IO_cookie_file
-{
- struct _IO_FILE __file;
- const void *__vtable;
- void *__cookie;
- _IO_cookie_io_functions_t __io_functions;
-};
+struct _IO_cookie_file;
/* Initialize one of those. */
extern void _IO_cookie_init (struct _IO_cookie_file *__cfile, int __read_write,
# define _IO_JUMPS_OFFSET 1
#endif
-#define _IO_JUMPS(THIS) ((struct _IO_FILE_plus *) (THIS))->vtable
+#define _IO_JUMPS(THIS) (THIS)->vtable
#define _IO_WIDE_JUMPS(THIS) ((struct _IO_FILE *) (THIS))->_wide_data->_wide_vtable
#define _IO_CHECK_WIDE(THIS) (((struct _IO_FILE *) (THIS))->_wide_data != NULL)
#if _IO_JUMPS_OFFSET
# define _IO_JUMPS_FUNC(THIS) \
- (*(struct _IO_jump_t **) ((void *) &((struct _IO_FILE_plus *) (THIS))->vtable\
+ (*(struct _IO_jump_t **) ((void *) &_IO_JUMPS ((struct _IO_FILE_plus *) (THIS)) \
+ (THIS)->_vtable_offset))
#else
-# define _IO_JUMPS_FUNC(THIS) _IO_JUMPS(THIS)
+# define _IO_JUMPS_FUNC(THIS) _IO_JUMPS ((struct _IO_FILE_plus *) (THIS))
#endif
#define _IO_WIDE_JUMPS_FUNC(THIS) _IO_WIDE_JUMPS(THIS)
#ifdef _G_USING_THUNKS
const struct _IO_jump_t *vtable;
};
+/* Special file type for fopencookie function. */
+struct _IO_cookie_file
+{
+ struct _IO_FILE_plus __fp;
+ void *__cookie;
+ _IO_cookie_io_functions_t __io_functions;
+};
+
/* Iterator type for walking global linked list of _IO_FILE objects. */
-typedef _IO_FILE *_IO_ITER;
+typedef struct _IO_FILE_plus *_IO_ITER;
/* Generic functions */
extern void _IO_init __P ((_IO_FILE *, int));
extern int _IO_sputbackc __P ((_IO_FILE *, int));
extern int _IO_sungetc __P ((_IO_FILE *));
-extern void _IO_un_link __P ((_IO_FILE *));
-extern void _IO_link_in __P ((_IO_FILE *));
+extern void _IO_un_link __P ((struct _IO_FILE_plus *));
+extern void _IO_link_in __P ((struct _IO_FILE_plus *));
extern void _IO_doallocbuf __P ((_IO_FILE *));
extern void _IO_unsave_markers __P ((_IO_FILE *));
extern void _IO_setb __P ((_IO_FILE *, char *, char *, int));
extern int _IO_file_underflow __P ((_IO_FILE *));
extern int _IO_file_overflow __P ((_IO_FILE *, int));
#define _IO_file_is_open(__fp) ((__fp)->_fileno != -1)
-extern void _IO_file_init __P ((_IO_FILE *));
+extern void _IO_file_init __P ((struct _IO_FILE_plus *));
extern _IO_FILE* _IO_file_attach __P ((_IO_FILE *, int));
extern _IO_FILE* _IO_file_open __P ((_IO_FILE *, const char *, int, int,
int, int));
int));
extern void _IO_no_init __P ((_IO_FILE *, int, int, struct _IO_wide_data *,
struct _IO_jump_t *));
-extern void _IO_new_file_init __P ((_IO_FILE *));
+extern void _IO_new_file_init __P ((struct _IO_FILE_plus *));
extern _IO_FILE* _IO_new_file_setbuf __P ((_IO_FILE *, char *, _IO_ssize_t));
extern int _IO_new_file_sync __P ((_IO_FILE *));
extern int _IO_new_file_underflow __P ((_IO_FILE *));
_IO_size_t));
extern int _IO_old_file_underflow __P ((_IO_FILE *));
extern int _IO_old_file_overflow __P ((_IO_FILE *, int));
-extern void _IO_old_file_init __P ((_IO_FILE *));
+extern void _IO_old_file_init __P ((struct _IO_FILE_plus *));
extern _IO_FILE* _IO_old_file_attach __P ((_IO_FILE *, int));
extern _IO_FILE* _IO_old_file_fopen __P ((_IO_FILE *, const char *,
const char *));
extern void _IO_str_finish __P ((_IO_FILE *, int));
/* Other strfile functions */
-extern void _IO_str_init_static __P ((_IO_FILE *, char *, int, char *));
-extern void _IO_str_init_readonly __P ((_IO_FILE *, const char *, int));
+struct _IO_strfile_;
+extern void _IO_str_init_static __P ((struct _IO_strfile_ *, char *, int, char *));
+extern void _IO_str_init_readonly __P ((struct _IO_strfile_ *, const char *, int));
extern _IO_ssize_t _IO_str_count __P ((_IO_FILE *));
/* And the wide character versions. */
int __width, int __precision, int __flags,
int __sign_mode, int __fill));
-extern _IO_FILE *_IO_list_all;
+extern struct _IO_FILE_plus *_IO_list_all;
extern void (*_IO_cleanup_registration_needed) __PMT ((void));
#ifndef EOF
-/* Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1999, 2000 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
if (buf == NULL)
return NULL;
_IO_no_init (&new_f->fp._sf._sbf._f, 0, 0, &new_f->wd, &_IO_wmem_jumps);
- _IO_JUMPS (&new_f->fp._sf._sbf._f) = &_IO_mem_jumps;
- _IO_str_init_static (&new_f->fp._sf._sbf._f, buf, _IO_BUFSIZ, buf);
+ _IO_JUMPS ((struct _IO_FILE_plus *) &new_f->fp._sf._sbf) = &_IO_mem_jumps;
+ _IO_str_init_static (&new_f->fp._sf, buf, _IO_BUFSIZ, buf);
new_f->fp._sf._sbf._f._flags &= ~_IO_USER_BUF;
new_f->fp._sf._s._allocate_buffer = (_IO_alloc_type) malloc;
new_f->fp._sf._s._free_buffer = (_IO_free_type) free;
new_f->fp.bufloc = bufloc;
new_f->fp.sizeloc = sizeloc;
- return &new_f->fp._sf._sbf._f;
+ return (_IO_FILE *) &new_f->fp._sf._sbf;
}
assert (size != 0);
}
- _IO_str_init_static (&new_f.ofile.file.file, obstack_base (obstack),
+ _IO_str_init_static ((struct _IO_strfile_ *) &new_f.ofile, obstack_base (obstack),
size, obstack_next_free (obstack));
/* Now allocate the rest of the current chunk. */
assert (size == (new_f.ofile.file.file._IO_write_end
new_f.ofile.obstack = obstack;
- result = _IO_vfprintf (&new_f.ofile.file.file, format, args);
+ result = _IO_vfprintf ((_IO_FILE *) &new_f.ofile.file, format, args);
/* Shrink the buffer to the space we really currently need. */
obstack_blank_fast (obstack, (new_f.ofile.file.file._IO_write_ptr
void
_IO_old_file_init (fp)
- _IO_FILE *fp;
+ 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
position before we do the first fseek (and until a following fflush). */
- fp->_old_offset = _IO_pos_BAD;
- fp->_IO_file_flags |= CLOSED_FILEBUF_FLAGS;
+ fp->file._old_offset = _IO_pos_BAD;
+ fp->file._IO_file_flags |= CLOSED_FILEBUF_FLAGS;
- _IO_link_in(fp);
- fp->_vtable_offset = ((int) sizeof (struct _IO_FILE)
- - (int) sizeof (struct _IO_FILE_complete));
- fp->_fileno = -1;
+ _IO_link_in (fp);
+ fp->file._vtable_offset = ((int) sizeof (struct _IO_FILE)
+ - (int) sizeof (struct _IO_FILE_complete));
+ fp->file._fileno = -1;
}
int
_IO_setg (fp, NULL, NULL, NULL);
_IO_setp (fp, NULL, NULL);
- _IO_un_link (fp);
+ _IO_un_link ((struct _IO_FILE_plus *) fp);
fp->_flags = _IO_MAGIC|CLOSED_FILEBUF_FLAGS;
fp->_fileno = -1;
fp->_old_offset = _IO_pos_BAD;
if (_IO_SEEKOFF (fp, (_IO_off_t)0, _IO_seek_end, _IOS_INPUT|_IOS_OUTPUT)
== _IO_pos_BAD && errno != ESPIPE)
return NULL;
- _IO_link_in (fp);
+ _IO_link_in ((struct _IO_FILE_plus *) fp);
return fp;
}
#endif
_IO_init (&new_f->fp.file, 0);
_IO_JUMPS (&new_f->fp) = &_IO_old_file_jumps;
- _IO_old_file_init (&new_f->fp.file);
+ _IO_old_file_init (&new_f->fp);
#if !_IO_UNIFIED_JUMPTABLES
new_f->fp.vtable = NULL;
#endif
if (_IO_old_file_attach (&new_f->fp.file, fd) == NULL)
{
- _IO_un_link (&new_f->fp.file);
+ _IO_un_link (&new_f->fp);
free (new_f);
return NULL;
}
_IO_mask_flags (&new_f->fp.file, read_write,
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
- return &new_f->fp.file;
+ return (_IO_FILE *) &new_f->fp;
}
strong_alias (_IO_old_fdopen, __old_fdopen)
new_f->fp.file._lock = &new_f->lock;
#endif
_IO_init (&new_f->fp.file, 0);
- _IO_JUMPS (&new_f->fp.file) = &_IO_old_file_jumps;
- _IO_old_file_init (&new_f->fp.file);
+ _IO_JUMPS (&new_f->fp) = &_IO_old_file_jumps;
+ _IO_old_file_init (&new_f->fp);
#if !_IO_UNIFIED_JUMPTABLES
new_f->fp.vtable = NULL;
#endif
- if (_IO_old_file_fopen (&new_f->fp.file, filename, mode) != NULL)
- return &new_f->fp.file;
- _IO_un_link (&new_f->fp.file);
+ if (_IO_old_file_fopen ((_IO_FILE *) &new_f->fp, filename, mode) != NULL)
+ return (_IO_FILE *) &new_f->fp;
+ _IO_un_link (&new_f->fp);
free (new_f);
return NULL;
}
#endif
fp = &new_f->fpx.file.file;
_IO_init (fp, 0);
- _IO_JUMPS (fp) = &_IO_old_proc_jumps;
- _IO_old_file_init (fp);
+ _IO_JUMPS (&new_f->fpx.file) = &_IO_old_proc_jumps;
+ _IO_old_file_init (&new_f->fpx.file);
#if !_IO_UNIFIED_JUMPTABLES
new_f->fpx.file.vtable = NULL;
#endif
if (_IO_old_proc_open (fp, command, mode) != NULL)
return fp;
- _IO_un_link (fp);
+ _IO_un_link (&new_f->fpx.file);
free (new_f);
return NULL;
}
#endif
DEF_STDFILE(_IO_stdin_, 0, 0, _IO_NO_WRITES);
-DEF_STDFILE(_IO_stdout_, 1, &_IO_stdin_.file, _IO_NO_READS);
-DEF_STDFILE(_IO_stderr_, 2, &_IO_stdout_.file,
- _IO_NO_READS+_IO_UNBUFFERED);
+DEF_STDFILE(_IO_stdout_, 1, &_IO_stdin_, _IO_NO_READS);
+DEF_STDFILE(_IO_stderr_, 2, &_IO_stdout_, _IO_NO_READS+_IO_UNBUFFERED);
#if defined __GNUC__ && __GNUC__ >= 2
extern FILE *stdout;
extern FILE *stderr;
-extern FILE *_IO_list_all;
+extern struct _IO_FILE_plus *_IO_list_all;
static void _IO_check_libio __P ((void)) __attribute__ ((constructor));
if (&_IO_stdin_used == NULL)
{
/* We are using the old one. */
- _IO_stdin = stdin = &_IO_stdin_.file;
- _IO_stdout = stdout = &_IO_stdout_.file;
- _IO_stderr = stderr = _IO_list_all = &_IO_stderr_.file;
+ _IO_stdin = stdin = (_IO_FILE *) &_IO_stdin_;
+ _IO_stdout = stdout = (_IO_FILE *) &_IO_stdout_;
+ _IO_stderr = stderr = (_IO_FILE *) &_IO_stderr_;
+ _IO_list_all = &_IO_stderr_;
_IO_stdin->_vtable_offset = _IO_stdout->_vtable_offset =
_IO_stderr->_vtable_offset = stdin->_vtable_offset =
stdout->_vtable_offset = stderr->_vtable_offset =
-/* Copyright (C) 1993, 1994, 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1994, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
#endif
DEF_STDFILE(_IO_2_1_stdin_, 0, 0, _IO_NO_WRITES);
-DEF_STDFILE(_IO_2_1_stdout_, 1, &_IO_2_1_stdin_.file, _IO_NO_READS);
-DEF_STDFILE(_IO_2_1_stderr_, 2, &_IO_2_1_stdout_.file,
- _IO_NO_READS+_IO_UNBUFFERED);
+DEF_STDFILE(_IO_2_1_stdout_, 1, &_IO_2_1_stdin_, _IO_NO_READS);
+DEF_STDFILE(_IO_2_1_stderr_, 2, &_IO_2_1_stdout_, _IO_NO_READS+_IO_UNBUFFERED);
-_IO_FILE *_IO_list_all = &_IO_2_1_stderr_.file;
+struct _IO_FILE_plus *_IO_list_all = &_IO_2_1_stderr_;
-/* Copyright (C) 1993, 1994, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1994, 1996, 1997, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
#undef stdin
#undef stdout
#undef stderr
-FILE *stdin = &_IO_2_1_stdin_.file;
-FILE *stdout = &_IO_2_1_stdout_.file;
-FILE *stderr = &_IO_2_1_stderr_.file;
+FILE *stdin = (FILE *) &_IO_2_1_stdin_;
+FILE *stdout = (FILE *) &_IO_2_1_stdout_;
+FILE *stderr = (FILE *) &_IO_2_1_stderr_;
#undef _IO_stdin
#undef _IO_stdout
-/* Copyright (C) 1993, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
#endif
void
-_IO_str_init_static (fp, ptr, size, pstart)
- _IO_FILE *fp;
+_IO_str_init_static (sf, ptr, size, pstart)
+ _IO_strfile *sf;
char *ptr;
int size;
char *pstart;
{
+ _IO_FILE *fp = &sf->_sbf._f;
+
if (size == 0)
size = strlen (ptr);
else if (size < 0)
fp->_IO_read_end = ptr+size;
}
/* A null _allocate_buffer function flags the strfile as being static. */
- (((_IO_strfile *) fp)->_s._allocate_buffer) = (_IO_alloc_type)0;
+ sf->_s._allocate_buffer = (_IO_alloc_type) 0;
}
void
-_IO_str_init_readonly (fp, ptr, size)
- _IO_FILE *fp;
+_IO_str_init_readonly (sf, ptr, size)
+ _IO_strfile *sf;
const char *ptr;
int size;
{
- _IO_str_init_static (fp, (char *) ptr, size, NULL);
- fp->_IO_file_flags |= _IO_NO_WRITES;
+ _IO_str_init_static (sf, (char *) ptr, size, NULL);
+ sf->_sbf._f._IO_file_flags |= _IO_NO_WRITES;
}
int
#ifdef _IO_MTSAFE_IO
sf._sbf._f._lock = &lock;
#endif
- _IO_no_init ((_IO_FILE *) &sf, 0, -1, NULL, NULL);
- _IO_JUMPS ((_IO_FILE *) &sf) = &_IO_str_jumps;
- _IO_str_init_static ((_IO_FILE *) &sf, string, init_string_size, string);
+ _IO_no_init ((_IO_FILE *) &sf._sbf, 0, -1, NULL, NULL);
+ _IO_JUMPS ((struct _IO_FILE_plus *) &sf._sbf) = &_IO_str_jumps;
+ _IO_str_init_static (&sf, string, init_string_size, string);
sf._sbf._f._flags &= ~_IO_USER_BUF;
sf._s._allocate_buffer = (_IO_alloc_type) malloc;
sf._s._free_buffer = (_IO_free_type) free;
-/* Copyright (C) 1994, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1997, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
}
_IO_no_init (&sf.f._sbf._f, 0, -1, NULL, NULL);
- _IO_JUMPS (&sf.f._sbf._f) = &_IO_strn_jumps;
+ _IO_JUMPS ((struct _IO_FILE_plus *) &sf.f._sbf) = &_IO_strn_jumps;
string[0] = '\0';
- _IO_str_init_static (&sf.f._sbf._f, string, maxlen - 1, string);
+ _IO_str_init_static (&sf.f, string, maxlen - 1, string);
ret = _IO_vfprintf (&sf.f._sbf._f, format, args);
if (sf.f._sbf._f._IO_buf_base != sf.overflow_buf)
-/* Copyright (C) 1993, 1995, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
Written by Ulrich Drepper <drepper@cygnus.com>.
Based on the single byte version by Per Bothner <bothner@cygnus.com>.
_IO_lock_fini (*fp->_lock);
#endif
- _IO_un_link (fp);
+ _IO_un_link ((struct _IO_FILE_plus *) fp);
}
do \
{ \
int offset; \
- void *ptr; \
+ void *__unbounded ptr; \
spec = (ChExpr); \
offset = NOT_IN_JUMP_RANGE (spec) ? REF (form_unknown) \
: table[CHAR_CLASS (spec)]; \
# define JUMP(ChExpr, table) \
do \
{ \
- const void *ptr; \
+ const void *__unbounded ptr; \
spec = (ChExpr); \
ptr = NOT_IN_JUMP_RANGE (spec) ? REF (form_unknown) \
: table[CHAR_CLASS (spec)]; \
{
CHAR_T buf[_IO_BUFSIZ];
struct helper_file helper;
- register _IO_FILE *hp = &helper._f.file;
+ register _IO_FILE *hp = (_IO_FILE *) &helper._f;
int result, to_flush;
/* Initialize helper. */
hp->_lock = &helper.lock;
__libc_lock_init (*hp->_lock);
#endif
- _IO_JUMPS (hp) = (struct _IO_jump_t *) &_IO_helper_jumps;
+ _IO_JUMPS (&helper._f) = (struct _IO_jump_t *) &_IO_helper_jumps;
/* Now print to helper instead. */
result = vfprintf (hp, format, args);
/* Print the number. */
#ifdef USE_IN_LIBIO
_IO_init ((_IO_FILE *) &f, 0);
- _IO_JUMPS ((_IO_FILE *) &f) = &_IO_str_jumps;
- _IO_str_init_static ((_IO_FILE *) &f, dest, (s + maxsize) - dest, dest);
+ _IO_JUMPS ((struct _IO_FILE_plus *) &f) = &_IO_str_jumps;
+ _IO_str_init_static ((_IO_strfile *) &f, dest, (s + maxsize) - dest, dest);
#else
memset ((void *) &f, 0, sizeof (f));
f.__magic = _IOMAGIC;
projects / external / glibc.git / commitdiff