Merge branch 'master' into chanserv-live

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

diff --git a/sqlite/sqlite.h b/sqlite/sqlite.h
index 3bc9765f2e1a0219ecc54134ef6d908ba4f0ff4e..6184c2b6ff2a186fdd32a9132e30867bf5833abe 100644 (file)
--- a/sqlite/sqlite.h
+++ b/sqlite/sqlite.h
@@ -1,24 +1,29 @@
 #ifndef __SQLITE_DB_H
 #define __SQLITE_DB_H
 
-#include <sqlite3.h>
+#include <stdlib.h>
 
-typedef sqlite3_stmt SQLiteConn;
-typedef int SQLiteModuleIdentifier;
-typedef void (*SQLiteQueryHandler)(SQLiteConn *, void *);
+#include "../sqlite/libsqlite3/sqlite3.h"
 
 typedef struct SQLiteResult {
-  SQLiteConn *r;
+  sqlite3_stmt *r;
+  char first, final;
+  short flags;
 } SQLiteResult;
 
-void sqliteasyncqueryf(SQLiteModuleIdentifier identifier, SQLiteQueryHandler handler, void *tag, int flags, char *format, ...);
+typedef SQLiteResult SQLiteConn;
+typedef int SQLiteModuleIdentifier;
+typedef void (*SQLiteQueryHandler)(SQLiteConn *, void *);
+
+void sqliteasyncqueryf(SQLiteModuleIdentifier identifier, SQLiteQueryHandler handler, void *tag, int flags, char *format, ...) __attribute__ ((format (printf, 5, 6)));
+void sqliteasyncqueryfv(int identifier, SQLiteQueryHandler handler, void *tag, int flags, char *format, va_list ap);
 
 int sqliteconnected(void);
 
 int sqlitegetid(void);
 void sqlitefreeid(int);
 
-void sqliteescapestring(char *, char *, unsigned int);
+size_t sqliteescapestring(char *buf, char *src, unsigned int len);
 
 SQLiteResult *sqlitegetresult(SQLiteConn *);
 int sqlitefetchrow(SQLiteResult *);
@@ -26,9 +31,11 @@ void sqliteclear(SQLiteResult *);
 
 int sqlitequerysuccessful(SQLiteResult *);
 
-#define sqlitegetvalue(result, column) (char *)sqlite3_column_text(result->r, column)
+#define sqlitegetvalue(result, column) ((char *)sqlite3_column_text(result->r, column))
 
-void sqlitecreateschema(char *schema);
-void sqliteloadtable(char *tablename, SQLiteQueryHandler init, SQLiteQueryHandler data, SQLiteQueryHandler fini);
+void sqliteattach(char *schema);
+void sqlitedetach(char *schema);
+void sqliteloadtable(char *tablename, SQLiteQueryHandler init, SQLiteQueryHandler data, SQLiteQueryHandler fini, void *tag);
+sqlite3 *sqlitegetconn(void);
 
 #endif