--- a/src/evpq.c	Sun Oct 12 00:17:09 2008 +0300
+++ b/src/evpq.c	Sun Oct 12 00:18:30 2008 +0300
@@ -62,7 +62,7 @@
         conn->state = EVPQ_CONNECTED;
 
         // tell the user the query is done
-        conn->user_cb.fn_done(conn, conn->user_c_arg);
+        conn->user_cb.fn_done(conn, conn->user_cb_arg);
 
         // stop waiting for more results
         return 1;

--- a/src/evpq_test.c	Sun Oct 12 00:17:09 2008 +0300
+++ b/src/evpq_test.c	Sun Oct 12 00:18:30 2008 +0300
@@ -63,8 +63,6 @@
         .fn_result = cb_result,
         .fn_done = cb_done,
         .fn_failure = cb_failure,
-
-        .cb_arg = NULL,
     };
 
     // initialize libevent
@@ -72,7 +70,7 @@
         ERROR("event_base_new");
 
     // establish the evpq connection
-    if ((conn = evpq_connect(ev_base, conninfo, cb_info)) == NULL)
+    if ((conn = evpq_connect(ev_base, conninfo, cb_info, NULL)) == NULL)
         ERROR("evpq_connect");
 
     // run libevent