Mercurial > hg > octave-terminal
changeset 12919:61906c0d1e9b
periodic merge of stable to default
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 04 Aug 2011 10:56:31 -0400 |
parents | d6209c354667 (current diff) f3a8d1efe2c1 (diff) |
children | 1322308fa83a |
files | src/oct-parse.yy |
diffstat | 4 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/lo-utils.cc +++ b/liboctave/lo-utils.cc @@ -124,7 +124,7 @@ do { - if (fgets (bufptr, grow_size, f)) + if (gnulib::fgets (bufptr, grow_size, f)) { len = strlen (bufptr);
--- a/src/c-file-ptr-stream.h +++ b/src/c-file-ptr-stream.h @@ -75,9 +75,9 @@ int file_number () const { return f ? fileno (f) : -1; } int seek (long offset, int origin) - { return f ? fseek (f, offset, origin) : -1; } + { return f ? gnulib::fseek (f, offset, origin) : -1; } - long tell (void) { return f ? ftell (f) : -1; } + long tell (void) { return f ? gnulib::ftell (f) : -1; } void clear (void) { if (f) clearerr (f); }
--- a/src/file-io.cc +++ b/src/file-io.cc @@ -1989,7 +1989,7 @@ OCTAVE_LOCAL_BUFFER (char, tmp, tmpl8.size () + 1); strcpy (tmp, tmpl8.c_str ()); - int fd = mkstemp (tmp); + int fd = gnulib::mkstemp (tmp); if (fd < 0) {
--- a/src/oct-parse.yy +++ b/src/oct-parse.yy @@ -3280,13 +3280,13 @@ static int text_getc (FILE *f) { - int c = getc (f); + int c = gnulib::getc (f); // Convert CRLF into just LF and single CR into LF. if (c == '\r') { - c = getc (f); + c = gnulib::getc (f); if (c != '\n') { @@ -3360,16 +3360,16 @@ { bool status = false; - long pos = ftell (ffile); + long pos = gnulib::ftell (ffile); char buf [10]; - fgets (buf, 10, ffile); + gnulib::fgets (buf, 10, ffile); size_t len = strlen (buf); if (len > 8 && strncmp (buf, "classdef", 8) == 0 && ! (isalnum (buf[8]) || buf[8] == '_')) status = true; - fseek (ffile, pos, SEEK_SET); + gnulib::fseek (ffile, pos, SEEK_SET); return status; } @@ -3420,16 +3420,16 @@ { bool status = false; - long pos = ftell (ffile); + long pos = gnulib::ftell (ffile); char buf [10]; - fgets (buf, 10, ffile); + gnulib::fgets (buf, 10, ffile); size_t len = strlen (buf); if (len > 8 && strncmp (buf, "function", 8) == 0 && ! (isalnum (buf[8]) || buf[8] == '_')) status = true; - fseek (ffile, pos, SEEK_SET); + gnulib::fseek (ffile, pos, SEEK_SET); return status; }