aboutsummaryrefslogtreecommitdiff
path: root/libio/wfileops.c
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2012-05-23 13:33:15 +0200
committerAndreas Schwab <schwab@linux-m68k.org>2012-05-24 23:06:20 +0200
commitd18ea0c5e669dd48ccceccfc90ff458dc333a81f (patch)
treec983ef90b2cf0abb23a33e704d0a2b7200142ab6 /libio/wfileops.c
parentc14874927b499ddfdbb03745bb32bfc778b8595f (diff)
downloadglibc-d18ea0c5e669dd48ccceccfc90ff458dc333a81f.tar
glibc-d18ea0c5e669dd48ccceccfc90ff458dc333a81f.tar.gz
glibc-d18ea0c5e669dd48ccceccfc90ff458dc333a81f.tar.bz2
glibc-d18ea0c5e669dd48ccceccfc90ff458dc333a81f.zip
Remove use of INTDEF/INTUSE in libio
Diffstat (limited to 'libio/wfileops.c')
-rw-r--r--libio/wfileops.c110
1 files changed, 55 insertions, 55 deletions
diff --git a/libio/wfileops.c b/libio/wfileops.c
index 13c2db58b4..3f628bfd1b 100644
--- a/libio/wfileops.c
+++ b/libio/wfileops.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1995,1997-2004,2006,2009,2011 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@cygnus.com>.
Based on the single byte version by Per Bothner <bothner@cygnus.com>.
@@ -112,7 +112,7 @@ _IO_wdo_write (fp, data, to_do)
return to_do == 0 ? 0 : WEOF;
}
-INTDEF(_IO_wdo_write)
+libc_hidden_def (_IO_wdo_write)
wint_t
@@ -183,7 +183,7 @@ _IO_wfile_underflow (fp)
free (fp->_IO_save_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_doallocbuf) (fp);
+ _IO_doallocbuf (fp);
fp->_IO_read_base = fp->_IO_read_ptr = fp->_IO_read_end =
fp->_IO_buf_base;
@@ -200,7 +200,7 @@ _IO_wfile_underflow (fp)
free (fp->_wide_data->_IO_save_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_wdoallocbuf) (fp);
+ _IO_wdoallocbuf (fp);
}
/* Flush all line buffered files before reading. */
@@ -208,7 +208,7 @@ _IO_wfile_underflow (fp)
if (fp->_flags & (_IO_LINE_BUF|_IO_UNBUFFERED))
{
#if 0
- INTUSE(_IO_flush_all_linebuffered) ();
+ _IO_flush_all_linebuffered ();
#else
/* We used to flush all line-buffered stream. This really isn't
required by any standard. My recollection is that
@@ -225,7 +225,7 @@ _IO_wfile_underflow (fp)
#endif
}
- INTUSE(_IO_switch_to_get_mode) (fp);
+ _IO_switch_to_get_mode (fp);
fp->_wide_data->_IO_read_base = fp->_wide_data->_IO_read_ptr =
fp->_wide_data->_IO_buf_base;
@@ -332,7 +332,7 @@ _IO_wfile_underflow (fp)
return *fp->_wide_data->_IO_read_ptr;
}
-INTDEF(_IO_wfile_underflow)
+libc_hidden_def (_IO_wfile_underflow)
static wint_t
@@ -371,7 +371,7 @@ _IO_wfile_underflow_mmap (_IO_FILE *fp)
free (fp->_wide_data->_IO_save_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_wdoallocbuf) (fp);
+ _IO_wdoallocbuf (fp);
}
fp->_wide_data->_IO_last_state = fp->_wide_data->_IO_state;
@@ -426,13 +426,13 @@ _IO_wfile_overflow (f, wch)
/* Allocate a buffer if needed. */
if (f->_wide_data->_IO_write_base == 0)
{
- INTUSE(_IO_wdoallocbuf) (f);
+ _IO_wdoallocbuf (f);
_IO_wsetg (f, f->_wide_data->_IO_buf_base,
f->_wide_data->_IO_buf_base, f->_wide_data->_IO_buf_base);
if (f->_IO_write_base == NULL)
{
- INTUSE(_IO_doallocbuf) (f);
+ _IO_doallocbuf (f);
_IO_setg (f, f->_IO_buf_base, f->_IO_buf_base, f->_IO_buf_base);
}
}
@@ -481,7 +481,7 @@ _IO_wfile_overflow (f, wch)
return WEOF;
return wch;
}
-INTDEF(_IO_wfile_overflow)
+libc_hidden_def (_IO_wfile_overflow)
wint_t
_IO_wfile_sync (fp)
@@ -543,7 +543,7 @@ _IO_wfile_sync (fp)
/* setg(base(), ptr, ptr); */
return retval;
}
-INTDEF(_IO_wfile_sync)
+libc_hidden_def (_IO_wfile_sync)
_IO_off64_t
_IO_wfile_seekoff (fp, offset, dir, mode)
@@ -580,7 +580,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
/* There is no more data in the backup buffer. We can
switch back. */
- INTUSE(_IO_switch_to_main_wget_area) (fp);
+ _IO_switch_to_main_wget_area (fp);
}
dir = _IO_seek_cur, offset = 0; /* Don't move any pointers. */
@@ -596,7 +596,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
if (fp->_wide_data->_IO_write_ptr > fp->_wide_data->_IO_write_base
|| _IO_in_put_mode (fp))
- if (INTUSE(_IO_switch_to_wget_mode) (fp))
+ if (_IO_switch_to_wget_mode (fp))
return WEOF;
if (fp->_wide_data->_IO_buf_base == NULL)
@@ -607,7 +607,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
free (fp->_wide_data->_IO_read_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_doallocbuf) (fp);
+ _IO_doallocbuf (fp);
_IO_setp (fp, fp->_IO_buf_base, fp->_IO_buf_base);
_IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base);
_IO_wsetp (fp, fp->_wide_data->_IO_buf_base,
@@ -738,7 +738,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
return offset;
dumb:
- INTUSE(_IO_unsave_markers) (fp);
+ _IO_unsave_markers (fp);
result = _IO_SYSSEEK (fp, offset, dir);
if (result != EOF)
{
@@ -763,7 +763,7 @@ resync:
return offset;
}
-INTDEF(_IO_wfile_seekoff)
+libc_hidden_def (_IO_wfile_seekoff)
_IO_size_t
@@ -829,38 +829,38 @@ _IO_wfile_xsputn (f, data, n)
to_do -= count;
}
if (to_do > 0)
- to_do -= INTUSE(_IO_wdefault_xsputn) (f, s, to_do);
+ to_do -= _IO_wdefault_xsputn (f, s, to_do);
if (must_flush
&& f->_wide_data->_IO_write_ptr != f->_wide_data->_IO_write_base)
- INTUSE(_IO_wdo_write) (f, f->_wide_data->_IO_write_base,
- f->_wide_data->_IO_write_ptr
- - f->_wide_data->_IO_write_base);
+ _IO_wdo_write (f, f->_wide_data->_IO_write_base,
+ f->_wide_data->_IO_write_ptr
+ - f->_wide_data->_IO_write_base);
return n - to_do;
}
-INTDEF(_IO_wfile_xsputn)
+libc_hidden_def (_IO_wfile_xsputn)
const struct _IO_jump_t _IO_wfile_jumps =
{
JUMP_INIT_DUMMY,
JUMP_INIT(finish, _IO_new_file_finish),
- JUMP_INIT(overflow, (_IO_overflow_t) INTUSE(_IO_wfile_overflow)),
- JUMP_INIT(underflow, (_IO_underflow_t) INTUSE(_IO_wfile_underflow)),
- JUMP_INIT(uflow, (_IO_underflow_t) INTUSE(_IO_wdefault_uflow)),
- JUMP_INIT(pbackfail, (_IO_pbackfail_t) INTUSE(_IO_wdefault_pbackfail)),
- JUMP_INIT(xsputn, INTUSE(_IO_wfile_xsputn)),
- JUMP_INIT(xsgetn, INTUSE(_IO_file_xsgetn)),
- JUMP_INIT(seekoff, INTUSE(_IO_wfile_seekoff)),
+ JUMP_INIT(overflow, (_IO_overflow_t) _IO_wfile_overflow),
+ JUMP_INIT(underflow, (_IO_underflow_t) _IO_wfile_underflow),
+ JUMP_INIT(uflow, (_IO_underflow_t) _IO_wdefault_uflow),
+ JUMP_INIT(pbackfail, (_IO_pbackfail_t) _IO_wdefault_pbackfail),
+ JUMP_INIT(xsputn, _IO_wfile_xsputn),
+ JUMP_INIT(xsgetn, _IO_file_xsgetn),
+ JUMP_INIT(seekoff, _IO_wfile_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_new_file_setbuf),
- JUMP_INIT(sync, (_IO_sync_t) INTUSE(_IO_wfile_sync)),
+ JUMP_INIT(sync, (_IO_sync_t) _IO_wfile_sync),
JUMP_INIT(doallocate, _IO_wfile_doallocate),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_new_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
- JUMP_INIT(close, INTUSE(_IO_file_close)),
- JUMP_INIT(stat, INTUSE(_IO_file_stat)),
+ JUMP_INIT(seek, _IO_file_seek),
+ JUMP_INIT(close, _IO_file_close),
+ JUMP_INIT(stat, _IO_file_stat),
JUMP_INIT(showmanyc, _IO_default_showmanyc),
JUMP_INIT(imbue, _IO_default_imbue)
};
@@ -871,22 +871,22 @@ const struct _IO_jump_t _IO_wfile_jumps_mmap =
{
JUMP_INIT_DUMMY,
JUMP_INIT(finish, _IO_new_file_finish),
- JUMP_INIT(overflow, (_IO_overflow_t) INTUSE(_IO_wfile_overflow)),
+ JUMP_INIT(overflow, (_IO_overflow_t) _IO_wfile_overflow),
JUMP_INIT(underflow, (_IO_underflow_t) _IO_wfile_underflow_mmap),
- JUMP_INIT(uflow, (_IO_underflow_t) INTUSE(_IO_wdefault_uflow)),
- JUMP_INIT(pbackfail, (_IO_pbackfail_t) INTUSE(_IO_wdefault_pbackfail)),
- JUMP_INIT(xsputn, INTUSE(_IO_wfile_xsputn)),
- JUMP_INIT(xsgetn, INTUSE(_IO_file_xsgetn)),
- JUMP_INIT(seekoff, INTUSE(_IO_wfile_seekoff)),
+ JUMP_INIT(uflow, (_IO_underflow_t) _IO_wdefault_uflow),
+ JUMP_INIT(pbackfail, (_IO_pbackfail_t) _IO_wdefault_pbackfail),
+ JUMP_INIT(xsputn, _IO_wfile_xsputn),
+ JUMP_INIT(xsgetn, _IO_file_xsgetn),
+ JUMP_INIT(seekoff, _IO_wfile_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_file_setbuf_mmap),
- JUMP_INIT(sync, (_IO_sync_t) INTUSE(_IO_wfile_sync)),
+ JUMP_INIT(sync, (_IO_sync_t) _IO_wfile_sync),
JUMP_INIT(doallocate, _IO_wfile_doallocate),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_new_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
+ JUMP_INIT(seek, _IO_file_seek),
JUMP_INIT(close, _IO_file_close_mmap),
- JUMP_INIT(stat, INTUSE(_IO_file_stat)),
+ JUMP_INIT(stat, _IO_file_stat),
JUMP_INIT(showmanyc, _IO_default_showmanyc),
JUMP_INIT(imbue, _IO_default_imbue)
};
@@ -895,22 +895,22 @@ const struct _IO_jump_t _IO_wfile_jumps_maybe_mmap =
{
JUMP_INIT_DUMMY,
JUMP_INIT(finish, _IO_new_file_finish),
- JUMP_INIT(overflow, (_IO_overflow_t) INTUSE(_IO_wfile_overflow)),
+ JUMP_INIT(overflow, (_IO_overflow_t) _IO_wfile_overflow),
JUMP_INIT(underflow, (_IO_underflow_t) _IO_wfile_underflow_maybe_mmap),
- JUMP_INIT(uflow, (_IO_underflow_t) INTUSE(_IO_wdefault_uflow)),
- JUMP_INIT(pbackfail, (_IO_pbackfail_t) INTUSE(_IO_wdefault_pbackfail)),
- JUMP_INIT(xsputn, INTUSE(_IO_wfile_xsputn)),
- JUMP_INIT(xsgetn, INTUSE(_IO_file_xsgetn)),
- JUMP_INIT(seekoff, INTUSE(_IO_wfile_seekoff)),
+ JUMP_INIT(uflow, (_IO_underflow_t) _IO_wdefault_uflow),
+ JUMP_INIT(pbackfail, (_IO_pbackfail_t) _IO_wdefault_pbackfail),
+ JUMP_INIT(xsputn, _IO_wfile_xsputn),
+ JUMP_INIT(xsgetn, _IO_file_xsgetn),
+ JUMP_INIT(seekoff, _IO_wfile_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_file_setbuf_mmap),
- JUMP_INIT(sync, (_IO_sync_t) INTUSE(_IO_wfile_sync)),
+ JUMP_INIT(sync, (_IO_sync_t) _IO_wfile_sync),
JUMP_INIT(doallocate, _IO_wfile_doallocate),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_new_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
- JUMP_INIT(close, INTUSE(_IO_file_close)),
- JUMP_INIT(stat, INTUSE(_IO_file_stat)),
+ JUMP_INIT(seek, _IO_file_seek),
+ JUMP_INIT(close, _IO_file_close),
+ JUMP_INIT(stat, _IO_file_stat),
JUMP_INIT(showmanyc, _IO_default_showmanyc),
JUMP_INIT(imbue, _IO_default_imbue)
};