CHANSERV: add missing error statements.

[irc/quakenet/newserv.git] / dbapi2 / dbapi2.h

diff --git a/dbapi2/dbapi2.h b/dbapi2/dbapi2.h
index 9829221ae70d14dbfd6bf020ecbdd2fad86cc3fe..d47b3a67e139974a0b42d4e9cb86c4ccfed30d2a 100644 (file)
--- a/dbapi2/dbapi2.h
+++ b/dbapi2/dbapi2.h
@@ -32,6 +32,7 @@ typedef void (*DBAPIQueryCallback)(const struct DBAPIResult *, void *);
 typedef void (*DBAPIQuery)(const struct DBAPIConn *, DBAPIQueryCallback, DBAPIUserData, const char *, ...) __attribute__ ((format (printf, 4, 5)));
 typedef void (*DBAPISimpleQuery)(const struct DBAPIConn *, const char *, ...) __attribute__ ((format (printf, 2, 3)));
 typedef void (*DBAPIQueryV)(const struct DBAPIConn *, DBAPIQueryCallback, DBAPIUserData, const char *);
+typedef void (*DBAPICallV)(const struct DBAPIConn *, DBAPIQueryCallback, DBAPIUserData, const char *, const char *);
 typedef void (*DBAPICreateTable)(const struct DBAPIConn *, DBAPIQueryCallback, DBAPIUserData, const char *, ...) __attribute__ ((format (printf, 4, 5)));
 typedef void (*DBAPICreateTableV)(const struct DBAPIConn *, DBAPIQueryCallback, DBAPIUserData, const char *);
 typedef void (*DBAPILoadTable)(const struct DBAPIConn *, DBAPIQueryCallback, DBAPIQueryCallback, DBAPIQueryCallback, DBAPIUserData, const char *);
@@ -42,6 +43,8 @@ typedef void (*DBAPISafeCreateTable)(const struct DBAPIConn *, DBAPIQueryCallbac
 
 typedef void (*DBAPIEscapeString)(const struct DBAPIConn *, char *, const char *, size_t);
 typedef int (*DBAPIQuoteString)(const struct DBAPIConn *, char *, size_t, const char *, size_t);
+typedef void (*DBAPICall)(const struct DBAPIConn *, DBAPIQueryCallback, DBAPIUserData, const char *, const char *, const char *, ...);
+typedef void (*DBAPISimpleCall)(const struct DBAPIConn *, const char *, const char *, const char *, ...);
 
 typedef char *(*DBAPITableName)(const struct DBAPIConn *, const char *);
 
@@ -59,6 +62,7 @@ typedef struct DBAPIProvider {
 
   DBAPIEscapeString escapestring;
   DBAPIQuoteString quotestring;
+  DBAPICallV call;
 
 /* private members */
   struct DBAPIProviderData *__providerdata;
@@ -67,16 +71,19 @@ typedef struct DBAPIProvider {
 typedef struct DBAPIConn {
   DBAPIClose close;
 
-  DBAPIQuery query;
-  DBAPISimpleQuery squery;
-  DBAPICreateTable createtable;
+  DBAPIQuery unsafequery;
+  DBAPISimpleQuery unsafesquery;
+  DBAPICreateTable unsafecreatetable;
   DBAPILoadTable loadtable;
   DBAPIEscapeString escapestring; /* deprecated */
   DBAPITableName tablename;
 
-  DBAPISafeQuery safequery;
-  DBAPISafeSimpleQuery safesquery;
-  DBAPISafeCreateTable safecreatetable;
+  DBAPISafeQuery query;
+  DBAPISafeSimpleQuery squery;
+  DBAPISafeCreateTable createtable;
+
+  DBAPICall call;
+  DBAPISimpleCall scall;
 
   char name[DBNAME_LEN+1];
 
@@ -87,6 +94,8 @@ typedef struct DBAPIConn {
   DBAPIQuoteString __quotestring;
   DBAPIQueryV __query;
   DBAPICreateTableV __createtable;
+  DBAPILoadTable __loadtable;
+  DBAPICallV __call;
 } DBAPIConn;
 
 typedef char *(*DBAPIResultGet)(const struct DBAPIResult *, unsigned int);
@@ -96,7 +105,7 @@ typedef void (*DBAPIResultClear)(const struct DBAPIResult *);
 typedef struct DBAPIResult {
   DBAPI2_RESULT_HANDLE *handle;
 
-  unsigned short success, fields;
+  unsigned short success, fields, affected;
 
   DBAPIResultGet get;
   DBAPIResultNext next;