FIX SQLite - using -ptr! instead of -ref! in definitions + using int-…

…ptr! type for void* values
red · Sep 15, 2017 · 63b75bf · 63b75bf
1 parent fe9fdf5
commit 63b75bf
Show file tree

Hide file tree

Showing 4 changed files with 147 additions and 147 deletions.
diff --git a/Library/SQLite/SQLite3-test-basic.reds b/Library/SQLite/SQLite3-test-basic.reds
@@ -10,8 +10,8 @@ Red/System [
 #include %SQLite3.reds
 
 db:     declare sqlite3!
-db-ref: declare sqlite3-ref!
-errmsg: declare string-ref!
+db-ptr: declare sqlite3-ptr!
+errmsg: declare string-ptr!
 data:   declare int-ptr!
 str:    declare c-string!
 
@@ -36,8 +36,8 @@ on-row: function [[cdecl]
 	"Process a result row."
 	data		[int-ptr!]
 	columns		[integer!]
-	values		[string-ref!]
-	names		[string-ref!]
+	values		[string-ptr!]
+	names		[string-ptr!]
 	return:		[integer!]
 ][
 	data/value: data/value + 1
@@ -74,9 +74,9 @@ status: sqlite3_initialize
 either SQLITE_OK <> status [
 	print-line ["SQLite init failed with status: " status]
 ][
-	status: sqlite3_open "test.db" db-ref
+	status: sqlite3_open "test.db" db-ptr
 	if SQLITE_OK = status [
-		db: db-ref/value
+		db: db-ptr/value
 		print-line ["DB: " db]
 
 		sqlite3_trace  db :on-trace null

diff --git a/Library/SQLite/SQLite3-test.reds b/Library/SQLite/SQLite3-test.reds
@@ -9,8 +9,8 @@ Red/System [
 #include %SQLite3.reds
 
 db:     declare sqlite3!
-db-ref: declare sqlite3-ref!
-errmsg: declare string-ref!
+db-ptr: declare sqlite3-ptr!
+errmsg: declare string-ptr!
 data:   declare int-ptr!
 str:    declare c-string!
 
@@ -37,8 +37,8 @@ on-row: function [[cdecl]
 	"Process a result row."
 	data		[int-ptr!]
 	columns		[integer!]
-	values		[string-ref!]
-	names		[string-ref!]
+	values		[string-ptr!]
+	names		[string-ptr!]
 	return:		[integer!]
 ][
 	data/value: data/value + 1
@@ -116,9 +116,9 @@ either SQLITE_OK <> status [
 		n: n + 1
 	]
 
-	status: sqlite3_open "test.db" db-ref
+	status: sqlite3_open "test.db" db-ptr
 	if SQLITE_OK = status [
-		db: db-ref/value
+		db: db-ptr/value
 		print-line ["DB: " db]
 
 		sqlite3_trace_v2  db (SQLITE_TRACE_STMT or SQLITE_TRACE_PROFILE) :on-trace null

diff --git a/Library/SQLite/SQLite3.red b/Library/SQLite/SQLite3.red
@@ -17,8 +17,8 @@ Red [
 
 	sqlite: context [
 		db-current: declare sqlite3!
-		db-ref: declare sqlite3-ref!
-		errmsg: declare string-ref!
+		db-ref: declare sqlite3-ptr!
+		errmsg: declare string-ptr!
 		data:   declare int-ptr!
 		str:    declare c-string!
 
@@ -103,8 +103,8 @@ Red [
 			"Process a result row."
 			data		[int-ptr!]
 			columns		[integer!]
-			values		[string-ref!]
-			names		[string-ref!]
+			values		[string-ptr!]
+			names		[string-ptr!]
 			return:		[integer!]
 		][
 
@@ -127,8 +127,8 @@ Red [
 			"Process a result row."
 			data		[int-ptr!]
 			columns		[integer!]
-			values		[string-ref!]
-			names		[string-ref!]
+			values		[string-ptr!]
+			names		[string-ptr!]
 			return:		[integer!]
 			/local
 				blk     [red-block!]