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 *, va_list);
+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 *);
typedef void (*DBAPISafeQuery)(const struct DBAPIConn *, DBAPIQueryCallback, DBAPIUserData, const char *, const char *, ...);
-typedef void (*DBAPISafeQueryV)(const struct DBAPIConn *, DBAPIQueryCallback, DBAPIUserData, const char *, const char *, va_list);
typedef void (*DBAPISafeSimpleQuery)(const struct DBAPIConn *, const char *, const char *, ...);
-typedef void (*DBAPISafeCreateTable)(const struct DBAPIConn *, const char *, ...) __attribute__ ((format (printf, 2, 3)));
+typedef void (*DBAPISafeCreateTable)(const struct DBAPIConn *, DBAPIQueryCallback, DBAPIUserData, const char *, const char *, ...);
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 *);
DBAPIClose close;
DBAPIQueryV query;
- DBAPICreateTable createtable;
+ DBAPICreateTableV createtable;
DBAPILoadTable loadtable;
DBAPITableName tablename;
-/*
- DBAPISafeQuery safequery;
- DBAPISafeSimpleQuery safesimplequery;
- DBAPISafeCreateTable safecreatetable;
-*/
-
DBAPIEscapeString escapestring;
DBAPIQuoteString quotestring;
+ DBAPICallV call;
/* private members */
struct DBAPIProviderData *__providerdata;
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 query;
+ DBAPISafeSimpleQuery squery;
+ DBAPISafeCreateTable createtable;
+
+ DBAPICall call;
+ DBAPISimpleCall scall;
+
char name[DBNAME_LEN+1];
void *handle;
DBAPIClose __close;
DBAPIQuoteString __quotestring;
DBAPIQueryV __query;
+ DBAPICreateTableV __createtable;
+ DBAPILoadTable __loadtable;
+ DBAPICallV __call;
} DBAPIConn;
typedef char *(*DBAPIResultGet)(const struct DBAPIResult *, unsigned int);
void deregisterdbprovider(int);
DBAPIConn *dbapi2open(const char *, const char *);
-void dbsnprintf(const DBAPIConn *, char *, size_t, const char *, const char *, ...);
-
#endif