diff src/lib-sql/driver-sqlite.c @ 6474:46c3e1ee196f HEAD

Added module_contexts to struct sql_db.
author Timo Sirainen <tss@iki.fi>
date Sat, 22 Sep 2007 19:01:19 +0300
parents 7cad076906eb
children af14dc005392
line wrap: on
line diff
--- a/src/lib-sql/driver-sqlite.c	Sat Sep 22 18:33:02 2007 +0300
+++ b/src/lib-sql/driver-sqlite.c	Sat Sep 22 19:01:19 2007 +0300
@@ -60,13 +60,11 @@
 static struct sql_db *driver_sqlite_init_v(const char *connect_string)
 {
 	struct sqlite_db *db;
-	pool_t pool;
 
 	i_assert(connect_string != NULL);
 
-	pool = pool_alloconly_create("sqlite driver", 512);
-	db = p_new(pool, struct sqlite_db, 1);
-	db->pool = pool;
+	db = i_new(struct sqlite_db, 1);
+	db->pool = pool_alloconly_create("sqlite driver", 512);;
 	db->api = driver_sqlite_db;
 	db->dbfile = p_strdup(db->pool, connect_string);
 	db->connected = FALSE;
@@ -374,20 +372,22 @@
 struct sql_db driver_sqlite_db = {
 	"sqlite",
 
-	driver_sqlite_init_v,
-	driver_sqlite_deinit_v,
-	driver_sqlite_get_flags,
-	driver_sqlite_connect,
-	driver_sqlite_escape_string,
-	driver_sqlite_exec,
-	driver_sqlite_query,
-	driver_sqlite_query_s,
+	MEMBER(v) {
+		driver_sqlite_init_v,
+		driver_sqlite_deinit_v,
+		driver_sqlite_get_flags,
+		driver_sqlite_connect,
+		driver_sqlite_escape_string,
+		driver_sqlite_exec,
+		driver_sqlite_query,
+		driver_sqlite_query_s,
 
-	driver_sqlite_transaction_begin,
-	driver_sqlite_transaction_commit,
-	driver_sqlite_transaction_commit_s,
-	driver_sqlite_transaction_rollback,
-	driver_sqlite_update
+		driver_sqlite_transaction_begin,
+		driver_sqlite_transaction_commit,
+		driver_sqlite_transaction_commit_s,
+		driver_sqlite_transaction_rollback,
+		driver_sqlite_update
+	}
 };
 
 struct sql_result driver_sqlite_result = {