diff options
| author | Olli Savia <ops@iki.fi> | 2007-06-03 20:08:20 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2007-06-03 20:08:20 +0000 |
| commit | 0fe1aa53459f2a9a71a6d439f9baa5c83ae0374d (patch) | |
| tree | 59d6c25b225121b87c5164433a2d2cbfb9a8aac1 | |
| parent | 18d818d9fe4359fc6b5f7a26b1b3dcf55c4d9ff5 (diff) | |
| download | ATCD-0fe1aa53459f2a9a71a6d439f9baa5c83ae0374d.tar.gz | |
ChangeLogTag: Sun Jun 3 20:05:36 UTC 2007 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/ace/Capabilities.cpp | 2 | ||||
| -rw-r--r-- | ACE/apps/Gateway/Gateway/File_Parser.cpp | 8 | ||||
| -rw-r--r-- | ACE/apps/gperf/src/Key_List.cpp | 2 | ||||
| -rw-r--r-- | ACE/examples/Mem_Map/IO-tests/IO_Test.cpp | 4 |
5 files changed, 16 insertions, 8 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 8269fdabf97..7d6c1822d16 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Sun Jun 3 20:05:36 UTC 2007 Olli Savia <ops@iki.fi> + + * ace/Capabilities.cpp: + * apps/Gateway/Gateway/File_Parser.cpp: + * apps/gperf/src/Key_List.cpp: + * examples/Mem_Map/IO-tests/IO_Test.cpp: + Added ACE_OS:: prefix to some plain function calls. + Fri Jun 1 22:26:39 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com> * ace/INET_Addr.h: diff --git a/ACE/ace/Capabilities.cpp b/ACE/ace/Capabilities.cpp index f0c641cc692..0e8cf753871 100644 --- a/ACE/ace/Capabilities.cpp +++ b/ACE/ace/Capabilities.cpp @@ -238,7 +238,7 @@ ACE_Capabilities::getline (FILE *fp, ACE_TString &line) line.set (0, 0); - while ((ch = fgetc (fp)) != EOF && ch != ACE_LIB_TEXT ('\n')) + while ((ch = ACE_OS::fgetc (fp)) != EOF && ch != ACE_LIB_TEXT ('\n')) line += (ACE_TCHAR) ch; if (ch == EOF && line.length () == 0) diff --git a/ACE/apps/Gateway/Gateway/File_Parser.cpp b/ACE/apps/Gateway/Gateway/File_Parser.cpp index 51d0e0d6c67..1feea67c291 100644 --- a/ACE/apps/Gateway/Gateway/File_Parser.cpp +++ b/ACE/apps/Gateway/Gateway/File_Parser.cpp @@ -83,7 +83,7 @@ File_Parser<ENTRY>::readword (char buf[]) // Skip over leading delimiters and get word. - while ((c = getc (this->infile_)) != EOF && c != '\n') + while ((c = ACE_OS::getc (this->infile_)) != EOF && c != '\n') if (this->delimiter (c)) { // We've reached the end of a "word". @@ -100,7 +100,7 @@ File_Parser<ENTRY>::readword (char buf[]) // gets processed. if (wordlength > 0) { - ungetc (c, this->infile_); + ACE_OS::ungetc (c, this->infile_); return FPRT::RT_SUCCESS; } else @@ -112,7 +112,7 @@ File_Parser<ENTRY>::readword (char buf[]) // if the EOLINE is just a delimiter, don't return EOLINE // so that the word gets processed if (wordlength > 0) - ungetc (c, this->infile_); + ACE_OS::ungetc (c, this->infile_); else return FPRT::RT_EOLINE; } @@ -148,7 +148,7 @@ File_Parser<ENTRY>::skipline (void) int c; - while ((c = getc (this->infile_)) != '\n' && c != EOF) + while ((c = ACE_OS::getc (this->infile_)) != '\n' && c != EOF) continue; return c; diff --git a/ACE/apps/gperf/src/Key_List.cpp b/ACE/apps/gperf/src/Key_List.cpp index cd627124648..7e47907d53c 100644 --- a/ACE/apps/gperf/src/Key_List.cpp +++ b/ACE/apps/gperf/src/Key_List.cpp @@ -153,7 +153,7 @@ Key_List::save_include_src (void) int c = getchar (); if (c != '%') - ungetc (c, stdin); + ACE_OS::ungetc (c, stdin); else if ((c = getchar ()) != '{') ACE_ERROR_RETURN ((LM_ERROR, "internal error, %c != '{' on line %l in file %N", diff --git a/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp b/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp index 86f2596098e..59c6414e35d 100644 --- a/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp +++ b/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp @@ -77,8 +77,8 @@ Stdio_Test::run_test (int iterations, { int c; - while ((c = getc (input_fp)) != EOF) - putc (c, output_fp); + while ((c = ACE_OS::getc (input_fp)) != EOF) + ACE_OS::putc (c, output_fp); ACE_OS::rewind (input_fp); ACE_OS::rewind (output_fp); |