diff options
Diffstat (limited to 'libio/wgenops.c')
| -rw-r--r-- | libio/wgenops.c | 65 |
1 files changed, 31 insertions, 34 deletions
diff --git a/libio/wgenops.c b/libio/wgenops.c index 886b25e1ab..f8f27b04a9 100644 --- a/libio/wgenops.c +++ b/libio/wgenops.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1993,1995,1997-2002,2004,2006,2012 - 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>. @@ -48,8 +47,6 @@ 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 (_IO_FILE *fp, wchar_t *end_p) __THROW; - _IO_ssize_t _IO_least_wmarker (fp, end_p) _IO_FILE *fp; @@ -62,7 +59,7 @@ _IO_least_wmarker (fp, end_p) least_so_far = mark->_pos; return least_so_far; } -INTDEF(_IO_least_wmarker) +libc_hidden_def (_IO_least_wmarker) /* Switch current get area from backup buffer to (start of) main get area. */ void @@ -82,7 +79,7 @@ _IO_switch_to_main_wget_area (fp) /* Set _IO_read_ptr. */ fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_base; } -INTDEF(_IO_switch_to_main_wget_area) +libc_hidden_def (_IO_switch_to_main_wget_area) /* Switch current get area from main get area to (end of) backup area. */ @@ -103,7 +100,7 @@ _IO_switch_to_wbackup_area (fp) /* Set _IO_read_ptr. */ fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_end; } -INTDEF(_IO_switch_to_wbackup_area) +libc_hidden_def (_IO_switch_to_wbackup_area) void @@ -122,7 +119,7 @@ _IO_wsetb (f, b, eb, a) else f->_flags2 |= _IO_FLAGS2_USER_WBUF; } -INTDEF(_IO_wsetb) +libc_hidden_def (_IO_wsetb) wint_t @@ -162,7 +159,7 @@ _IO_wdefault_pbackfail (fp, c) fp->_wide_data->_IO_backup_base = fp->_wide_data->_IO_save_end; } fp->_wide_data->_IO_read_base = fp->_wide_data->_IO_read_ptr; - INTUSE(_IO_switch_to_wbackup_area) (fp); + _IO_switch_to_wbackup_area (fp); } else if (fp->_wide_data->_IO_read_ptr <= fp->_wide_data->_IO_read_base) { @@ -187,7 +184,7 @@ _IO_wdefault_pbackfail (fp, c) } return c; } -INTDEF(_IO_wdefault_pbackfail) +libc_hidden_def (_IO_wdefault_pbackfail) void @@ -217,9 +214,9 @@ _IO_wdefault_finish (fp, dummy) _IO_lock_fini (*fp->_lock); #endif - INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) fp); + _IO_un_link ((struct _IO_FILE_plus *) fp); } -INTDEF(_IO_wdefault_finish) +libc_hidden_def (_IO_wdefault_finish) wint_t @@ -232,7 +229,7 @@ _IO_wdefault_uflow (fp) return WEOF; return *fp->_wide_data->_IO_read_ptr++; } -INTDEF(_IO_wdefault_uflow) +libc_hidden_def (_IO_wdefault_uflow) wint_t @@ -257,13 +254,13 @@ __wuflow (fp) if (fp->_mode == 0) _IO_fwide (fp, 1); if (_IO_in_put_mode (fp)) - if (INTUSE(_IO_switch_to_wget_mode) (fp) == EOF) + if (_IO_switch_to_wget_mode (fp) == EOF) return WEOF; if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end) return *fp->_wide_data->_IO_read_ptr++; if (_IO_in_backup (fp)) { - INTUSE(_IO_switch_to_main_wget_area) (fp); + _IO_switch_to_main_wget_area (fp); if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end) return *fp->_wide_data->_IO_read_ptr++; } @@ -273,7 +270,7 @@ __wuflow (fp) return WEOF; } else if (_IO_have_wbackup (fp)) - INTUSE(_IO_free_wbackup_area) (fp); + _IO_free_wbackup_area (fp); return _IO_UFLOW (fp); } libc_hidden_def (__wuflow) @@ -288,13 +285,13 @@ __wunderflow (fp) if (fp->_mode == 0) _IO_fwide (fp, 1); if (_IO_in_put_mode (fp)) - if (INTUSE(_IO_switch_to_wget_mode) (fp) == EOF) + if (_IO_switch_to_wget_mode (fp) == EOF) return WEOF; if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end) return *fp->_wide_data->_IO_read_ptr; if (_IO_in_backup (fp)) { - INTUSE(_IO_switch_to_main_wget_area) (fp); + _IO_switch_to_main_wget_area (fp); if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end) return *fp->_wide_data->_IO_read_ptr; } @@ -304,7 +301,7 @@ __wunderflow (fp) return WEOF; } else if (_IO_have_backup (fp)) - INTUSE(_IO_free_wbackup_area) (fp); + _IO_free_wbackup_area (fp); return _IO_UNDERFLOW (fp); } libc_hidden_def (__wunderflow) @@ -358,7 +355,7 @@ _IO_wdefault_xsputn (f, data, n) } return n - more; } -INTDEF(_IO_wdefault_xsputn) +libc_hidden_def (_IO_wdefault_xsputn) _IO_size_t @@ -405,7 +402,7 @@ _IO_wdefault_xsgetn (fp, data, n) } return n - more; } -INTDEF(_IO_wdefault_xsgetn) +libc_hidden_def (_IO_wdefault_xsgetn) void @@ -417,10 +414,10 @@ _IO_wdoallocbuf (fp) if (!(fp->_flags & _IO_UNBUFFERED)) if ((wint_t)_IO_WDOALLOCATE (fp) != WEOF) return; - INTUSE(_IO_wsetb) (fp, fp->_wide_data->_shortbuf, + _IO_wsetb (fp, fp->_wide_data->_shortbuf, fp->_wide_data->_shortbuf + 1, 0); } -INTDEF(_IO_wdoallocbuf) +libc_hidden_def (_IO_wdoallocbuf) int @@ -430,10 +427,10 @@ _IO_wdefault_doallocate (fp) wchar_t *buf; ALLOC_WBUF (buf, _IO_BUFSIZ, EOF); - INTUSE(_IO_wsetb) (fp, buf, buf + _IO_BUFSIZ, 1); + _IO_wsetb (fp, buf, buf + _IO_BUFSIZ, 1); return 1; } -INTDEF(_IO_wdefault_doallocate) +libc_hidden_def (_IO_wdefault_doallocate) int @@ -459,20 +456,20 @@ _IO_switch_to_wget_mode (fp) fp->_flags &= ~_IO_CURRENTLY_PUTTING; return 0; } -INTDEF(_IO_switch_to_wget_mode) +libc_hidden_def (_IO_switch_to_wget_mode) void _IO_free_wbackup_area (fp) _IO_FILE *fp; { if (_IO_in_backup (fp)) - INTUSE(_IO_switch_to_main_wget_area) (fp); /* Just in case. */ + _IO_switch_to_main_wget_area (fp); /* Just in case. */ free (fp->_wide_data->_IO_save_base); fp->_wide_data->_IO_save_base = NULL; fp->_wide_data->_IO_save_end = NULL; fp->_wide_data->_IO_backup_base = NULL; } -INTDEF(_IO_free_wbackup_area) +libc_hidden_def (_IO_free_wbackup_area) #if 0 int @@ -504,7 +501,7 @@ save_for_wbackup (fp, end_p) wchar_t *end_p; { /* Append [_IO_read_base..end_p] to backup area. */ - _IO_ssize_t least_mark = INTUSE(_IO_least_wmarker) (fp, end_p); + _IO_ssize_t least_mark = _IO_least_wmarker (fp, end_p); /* needed_size is how much space we need in the backup area. */ _IO_size_t needed_size = ((end_p - fp->_wide_data->_IO_read_base) - least_mark); @@ -616,7 +613,7 @@ _IO_sputbackwc (fp, c) return result; } -INTDEF(_IO_sputbackwc) +libc_hidden_def (_IO_sputbackwc) wint_t _IO_sungetwc (fp) @@ -659,7 +656,7 @@ _IO_init_wmarker (marker, fp) { marker->_sbuf = fp; if (_IO_in_put_mode (fp)) - INTUSE(_IO_switch_to_wget_mode) (fp); + _IO_switch_to_wget_mode (fp); if (_IO_in_backup (fp)) marker->_pos = fp->_wide_data->_IO_read_ptr - fp->_wide_data->_IO_read_end; else @@ -701,14 +698,14 @@ _IO_seekwmark (fp, mark, delta) if (mark->_pos >= 0) { if (_IO_in_backup (fp)) - INTUSE(_IO_switch_to_main_wget_area) (fp); + _IO_switch_to_main_wget_area (fp); fp->_wide_data->_IO_read_ptr = (fp->_wide_data->_IO_read_base + mark->_pos); } else { if (!_IO_in_backup (fp)) - INTUSE(_IO_switch_to_wbackup_area) (fp); + _IO_switch_to_wbackup_area (fp); fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_end + mark->_pos; } return 0; @@ -739,5 +736,5 @@ _IO_unsave_wmarkers (fp) } if (_IO_have_backup (fp)) - INTUSE(_IO_free_wbackup_area) (fp); + _IO_free_wbackup_area (fp); } |