diff options
author | John Wiegley <johnw@newartisans.com> | 2010-06-13 00:42:25 -0400 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2010-06-13 00:42:25 -0400 |
commit | 40f553228f5a28034c6635fdcb4c86af28a385ed (patch) | |
tree | 2c40305c9f9841a4c3d453a4a5c49ec69056b4b2 /src/pyfstream.h | |
parent | 556211e623cad88213e5087b5c9c36e754d9aa02 (diff) | |
parent | b1b4e2aadff5983d443d70c09ea86a41b015873f (diff) | |
download | fork-ledger-40f553228f5a28034c6635fdcb4c86af28a385ed.tar.gz fork-ledger-40f553228f5a28034c6635fdcb4c86af28a385ed.tar.bz2 fork-ledger-40f553228f5a28034c6635fdcb4c86af28a385ed.zip |
Merge branch 'next'
Diffstat (limited to 'src/pyfstream.h')
-rw-r--r-- | src/pyfstream.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pyfstream.h b/src/pyfstream.h index 02e4d240..37978ff4 100644 --- a/src/pyfstream.h +++ b/src/pyfstream.h @@ -59,7 +59,7 @@ protected: z[0] = static_cast<char>(c); z[1] = '\0'; if (PyFile_WriteString(z, reinterpret_cast<PyObject *>(fo)) < 0) { - return EOF; + return EOF; } } return c; @@ -124,8 +124,8 @@ public: TRACE_CTOR(pyinbuf, "PyFileObject *"); setg (buffer+pbSize, // beginning of putback area - buffer+pbSize, // read position - buffer+pbSize); // end position + buffer+pbSize, // read position + buffer+pbSize); // end position } ~pyinbuf() throw() { TRACE_DTOR(pyinbuf); @@ -157,7 +157,7 @@ protected: * the putback area */ memmove (buffer+(pbSize-numPutback), gptr()-numPutback, - numPutback); + numPutback); // read at most bufSize new characters PyObject *line = PyFile_GetLine(reinterpret_cast<PyObject *>(fo), bufSize); @@ -174,8 +174,8 @@ protected: // reset buffer pointers setg (buffer+(pbSize-numPutback), // beginning of putback area - buffer+pbSize, // read position - buffer+pbSize+num); // end of buffer + buffer+pbSize, // read position + buffer+pbSize+num); // end of buffer // return next character return traits_type::to_int_type(*gptr()); |