Mercurial > forge
diff main/database/src/pq_lo.cc @ 11645:bd5a8f1bdfb8 octave-forge
Clean out harmless warnings and one unnecessarily returned column.
| author | i7tiol |
|---|---|
| date | Mon, 22 Apr 2013 13:40:13 +0000 |
| parents | 35e9e4b6ab34 |
| children | cbff4e8a8af8 |
line wrap: on
line diff
--- a/main/database/src/pq_lo.cc Mon Apr 22 10:56:37 2013 +0000 +++ b/main/database/src/pq_lo.cc Mon Apr 22 13:40:13 2013 +0000 @@ -49,6 +49,10 @@ private: + octave_pq_connection &oct_pq_conn; + + PGconn *conn; + Oid oid; FILE *fp; @@ -58,16 +62,13 @@ int lod; bool commit; - - octave_pq_connection &oct_pq_conn; - - PGconn *conn; }; pipe_to_lo::pipe_to_lo (octave_pq_connection &a_oct_pq_conn, - const char *cmd, bool acommit, std::string &amsg) : - oct_pq_conn (a_oct_pq_conn), conn (a_oct_pq_conn.octave_pq_get_conn ()), - oid (0), fp (NULL), oid_valid (false), lod (-1), commit (acommit), msg (amsg) + const char *cmd, bool acommit, std::string &amsg) + : msg (amsg), oct_pq_conn (a_oct_pq_conn), + conn (a_oct_pq_conn.octave_pq_get_conn ()), oid (0), fp (NULL), + oid_valid (false), lod (-1), commit (acommit) { BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; oid = lo_creat (conn, INV_WRITE); @@ -100,7 +101,8 @@ char buff [OCT_PQ_BUFSIZE]; - int nb, pnb; + int nb = 0, pnb = 0; // silence inadequate warnings by initializing + // them while (true) { @@ -193,6 +195,10 @@ private: + octave_pq_connection &oct_pq_conn; + + PGconn *conn; + Oid oid; FILE *fp; @@ -202,16 +208,13 @@ int lod; bool commit; - - octave_pq_connection &oct_pq_conn; - - PGconn *conn; }; lo_to_pipe::lo_to_pipe (octave_pq_connection &a_oct_pq_conn, Oid aoid, const char *cmd, bool acommit, std::string &amsg) : - oct_pq_conn (a_oct_pq_conn), conn (a_oct_pq_conn.octave_pq_get_conn ()), - fp (NULL), success (false), lod (-1), commit (acommit), msg (amsg), oid (aoid) + msg (amsg), oct_pq_conn (a_oct_pq_conn), + conn (a_oct_pq_conn.octave_pq_get_conn ()), oid (aoid), fp (NULL), + success (false), lod (-1), commit (acommit) { if (! (fp = popen (cmd, "w"))) { @@ -232,7 +235,8 @@ char buff [OCT_PQ_BUFSIZE]; - int nb, pnb; + int nb = 0, pnb = 0; // silence inadequate warnings by initializing + // them while (true) {