Mercurial > hg > octave-nkf
changeset 12912:e116dd862879 stable
use gnulib:: qualifiers for more stdio functions
* input.cc (gnu_readline): Use gnulib::fflush instead of fflush.
* sparse-util.cc (SparseCholPrint): Likewise.
* kpse.cc (DEBUGF_END, hash_lookup, kpse_element_dirs): Likewise.
* cmd-edit.cc (default_command_editor::do_readline): Likewise.
* c-file-ptr-stream.cc (c_file_ptr_buf::flush): Likewise.
(c_file_ptr_buf::xsgetn): Use gnulib::fread instead of fread.
(c_file_ptr_buf::underflow_common): Use gnulib::fgetc instead of
fgetc.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 03 Aug 2011 13:56:53 -0400 |
parents | c68fe26745ae |
children | 34e5434563df f3a8d1efe2c1 |
files | liboctave/cmd-edit.cc liboctave/kpse.cc liboctave/sparse-util.cc src/c-file-ptr-stream.cc src/input.cc |
diffstat | 5 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/cmd-edit.cc +++ b/liboctave/cmd-edit.cc @@ -765,7 +765,7 @@ default_command_editor::do_readline (const std::string& prompt, bool& eof) { gnulib::fputs (prompt.c_str (), output_stream); - fflush (output_stream); + gnulib::fflush (output_stream); return octave_fgetl (input_stream, eof); }
--- a/liboctave/kpse.cc +++ b/liboctave/kpse.cc @@ -212,7 +212,7 @@ /* A printf for the debugging. */ #define DEBUGF_START() do { gnulib::fputs ("kdebug:", stderr) -#define DEBUGF_END() fflush (stderr); } while (0) +#define DEBUGF_END() gnulib::fflush (stderr); } while (0) #define DEBUGF(str) \ DEBUGF_START (); gnulib::fputs (str, stderr); DEBUGF_END () @@ -432,7 +432,7 @@ } gnulib::putc ('\n', stderr); } - fflush (stderr); + gnulib::fflush (stderr); } #endif @@ -2428,7 +2428,7 @@ gnulib::fprintf (stderr, " %s", (STR_LLIST (*e)).c_str ()); } gnulib::putc ('\n', stderr); - fflush (stderr); + gnulib::fflush (stderr); } #endif /* KPSE_DEBUG */
--- a/liboctave/sparse-util.cc +++ b/liboctave/sparse-util.cc @@ -52,7 +52,7 @@ va_list args; va_start (args, fmt); int ret = gnulib::vfprintf (stderr, fmt, args); - fflush (stderr); + gnulib::fflush (stderr); va_end (args); return ret; }
--- a/src/c-file-ptr-stream.cc +++ b/src/c-file-ptr-stream.cc @@ -68,7 +68,7 @@ { if (f) { - int_type c = fgetc (f); + int_type c = gnulib::fgetc (f); if (! bump #if defined (CXX_ISO_COMPLIANT_LIBRARY) @@ -112,7 +112,7 @@ c_file_ptr_buf::xsgetn (char *s, std::streamsize n) { if (f) - return fread (s, 1, n, f); + return gnulib::fread (s, 1, n, f); else return 0; } @@ -173,7 +173,7 @@ int c_file_ptr_buf::flush (void) { - return f ? fflush (f) : EOF; + return f ? gnulib::fflush (f) : EOF; } int