Merge.

[irc/quakenet/newserv.git] / pqsql / pqsql.c

diff --git a/pqsql/pqsql.c b/pqsql/pqsql.c
index e4f0225249aa28a2d9fece4deb42ff8f63553a68..ea9fd102df9a9cf1aa18951bf22f6de1c55d3089 100644 (file)
--- a/pqsql/pqsql.c
+++ b/pqsql/pqsql.c
@@ -188,14 +188,15 @@ void dbhandler(int fd, short revents) {
         if(queryhead->identifier != QH_ALREADYFIRED) {
           switch(PQresultStatus(res)) {
             case PGRES_TUPLES_OK:
-              Error("pqsql", ERR_WARNING, "Unhandled tuples output (query: %s)", queryhead->query);
+              if(!(queryhead->flags & DB_CALL))
+                Error("pqsql", ERR_WARNING, "Unhandled tuples output (query: %s)", queryhead->query);
               break;
 
             case PGRES_NONFATAL_ERROR:
             case PGRES_FATAL_ERROR:
               /* if a create query returns an error assume it went ok, paul will winge about this */
               if(!(queryhead->flags & DB_CREATE))
-                Error("pqsql", ERR_WARNING, "Unhandled error response (query: %s)", queryhead->query);
+                Error("pqsql", ERR_WARNING, "Unhandled error response (query: %s): %s", queryhead->query, PQresultErrorMessage(res));
               break;
          
             default:
@@ -232,15 +233,18 @@ void dbhandler(int fd, short revents) {
 }
 
 /* sorry Q9 */
-void pqasyncqueryfv(int identifier, PQQueryHandler handler, void *tag, int flags, char *format, va_list va) {
+void pqasyncqueryf(int identifier, PQQueryHandler handler, void *tag, int flags, char *format, ...) {
   char querybuf[8192];
   int len;
   pqasyncquery_s *qp;
+  va_list va;
 
   if(!pqconnected())
     return;
 
+  va_start(va, format);
   len = vsnprintf(querybuf, sizeof(querybuf), format, va);
+  va_end(va);
 
   /* PPA: no check here... */
   qp = (pqasyncquery_s *)nsmalloc(POOL_PQSQL, sizeof(pqasyncquery_s));
@@ -273,14 +277,6 @@ void pqasyncqueryfv(int identifier, PQQueryHandler handler, void *tag, int flags
   }
 }
 
-void pqasyncqueryf(int identifier, PQQueryHandler handler, void *tag, int flags, char *format, ...) {
-  va_list va;
-
-  va_start(va, format);
-  pqasyncqueryfv(identifier, handler, tag, flags, format, va);
-  va_end(va);
-}
-
 void pqloadtable(char *tablename, PQQueryHandler init, PQQueryHandler data, PQQueryHandler fini, void *tag)
 {
   pqtableloaderinfo_s *tli;