pgsocket: handle freeing PGresult

this makes life easier in user callback.

diff --git a/usual/pgsocket.c b/usual/pgsocket.c
index 4b19c26e2f89a0bd7b98f7daf8d65c80c163d82b..3845dabb981ad5da90a480af82f6d6415d2c59ff 100644 (file)
--- a/usual/pgsocket.c
+++ b/usual/pgsocket.c
@@ -45,6 +45,8 @@ struct PgSocket {
        const char *connstr;
 
        struct event_base *base;
+
+       PGresult *last_result;
 };
 
 static void send_event(struct PgSocket *db, enum PgEvent ev)
@@ -90,7 +92,7 @@ static void conn_error(struct PgSocket *db, enum PgEvent ev, const char *desc)
 static void result_cb(int sock, short flags, void *arg)
 {
        struct PgSocket *db = arg;
-       PGresult *res, *res_saved = NULL;
+       PGresult *res;
 
        db->wait_type = 0;
 
@@ -112,13 +114,16 @@ static void result_cb(int sock, short flags, void *arg)
                if (!res)
                        break;
 
-               if (res_saved) {
-                       PQclear(res_saved);
-               }
-               res_saved = res;
+               if (db->last_result)
+                       PQclear(db->last_result);
+               db->last_result = res;
        }
 
-       db->handler_func(db, db->handler_arg, PGS_RESULT_OK, res_saved);
+       res = db->last_result;
+       db->last_result = NULL;
+
+       db->handler_func(db, db->handler_arg, PGS_RESULT_OK, res);
+       PQclear(res);
 }
 
 static void send_cb(int sock, short flags, void *arg)
@@ -212,6 +217,10 @@ void pgs_disconnect(struct PgSocket *db)
                PQfinish(db->con);
                db->con = NULL;
        }
+       if (db->last_result) {
+               PQclear(db->last_result);
+               db->last_result = NULL;
+       }
 }
 
 void pgs_free(struct PgSocket *db)