commit - ea441465ce55b1bb68015a417c6560f65b3b8007
commit + 7446e0fc689e1d058a24b2b1b48883f678d6daea
blob - 9d2a989972eac004d8e9c43de1fa2e2dfa20ff4a
blob + f8183b8d93b60e64fc44c3442b4168c2b45717dd
--- sqlite3/sqlite3.ha
+++ sqlite3/sqlite3.ha
@@ -25,7 +25,7 @@ use strings;
 use types;
 use types::c;
 
-export type sqlite3 = *opaque;
+export type conn = *opaque;
 export type statement = *opaque;
 
 export def OPEN_READONLY:	int = 0x00000001;
@@ -53,7 +53,7 @@ export def def_open_flags = OPEN_READWRITE | OPEN_CREA
 ) int;
 
 // XXX vfs support?
-export fn open(filename: const str, flags: int...) (sqlite3 | error) = {
+export fn open(filename: const str, flags: int...) (conn | error) = {
 	let f = if (len(flags) == 0) def_open_flags else flags[0];
 
 	let path = c::fromstr(filename);
@@ -62,15 +62,15 @@ export fn open(filename: const str, flags: int...) (sq
 	let addr: uintptr = 0;
 	let ret = libsqlite3_open_v2(path, &addr: *opaque, f, null);
 	if (ret == sqlite_ok) {
-		return (addr: *opaque): sqlite3;
+		return (addr: *opaque): conn;
 	};
 	return code2err(ret);
 };
 
 @symbol("sqlite3_close_v2") fn libsqlite3_close_v2(sqlite3: *opaque) int;
 
-export fn close(db: sqlite3) (void | error) = {
-	let ret = libsqlite3_close_v2(db: *opaque);
+export fn close(conn: conn) (void | error) = {
+	let ret = libsqlite3_close_v2(conn: *opaque);
 	if (ret != sqlite_ok) {
 		return code2err(ret);
 	};
@@ -84,12 +84,12 @@ export fn close(db: sqlite3) (void | error) = {
 	tail: nullable *opaque,
 ) int;
 
-export fn prepare(db: sqlite3, sql: const str) (statement | error) = {
+export fn prepare(conn: conn, sql: const str) (statement | error) = {
 	let s = c::fromstr(sql);
 	defer free(s);
 
 	let stmt: uintptr = 0;
-	let ret = libsqlite3_prepare_v2(db: *opaque, s, -1, &stmt: *opaque,
+	let ret = libsqlite3_prepare_v2(conn: *opaque, s, -1, &stmt: *opaque,
 		null);
 	if (ret == sqlite_ok) {
 		return stmt: statement;