aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2017-07-24 15:29:16 +0000
committerdrh <drh@noemail.net>2017-07-24 15:29:16 +0000
commit1d8536bc0f74e54f97c21724c878c6eb231a3fb8 (patch)
tree9c007fcf80ecc137fc200f8aab910b445424aae0
parentcaf8cc1b4b2c0d13bffa04bcccd3790f803afb15 (diff)
downloadsqlite-1d8536bc0f74e54f97c21724c878c6eb231a3fb8.tar.gz
sqlite-1d8536bc0f74e54f97c21724c878c6eb231a3fb8.zip
Additional documentation on sqlite3_bind_pointer() and sqlite3_result_pointer().
No changes to code. FossilOrigin-Name: b1572d4e05934a0dc1b73092acba652fa50e97552eb6e9a1cedea7c71055804b
-rw-r--r--manifest12
-rw-r--r--manifest.uuid2
-rw-r--r--src/sqlite.h.in16
3 files changed, 19 insertions, 11 deletions
diff --git a/manifest b/manifest
index 5e1311235..7d15dac75 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Compiler\swarning\sfix\sassociated\swith\sdate/time\sfunctions.
-D 2017-07-24T14:44:15.392
+C Additional\sdocumentation\son\ssqlite3_bind_pointer()\sand\ssqlite3_result_pointer().\nNo\schanges\sto\scode.
+D 2017-07-24T15:29:16.514
F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
@@ -455,7 +455,7 @@ F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
F src/select.c c6bf96a7f9d7d68f929de84738c599a30d0a725ab0b54420e70545743cd5ee7b
F src/shell.c bd6a37cbe8bf64ef6a6a74fdc50f067d3148149b4ce2b4d03154663e66ded55f
F src/shell.c.in b5725acacba95ccefa57b6d068f710e29ba8239c3aa704628a1902a1f729c175
-F src/sqlite.h.in e2ffa1f15c936902489a4001fba9800ddf3d09fef19c9ca4fbd9e7df39106998
+F src/sqlite.h.in 6832630003ce858f55c750181488f30aa167870110d843035e501729a6a1c4cf
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
F src/sqlite3ext.h 967154985ed2ae62f90d9029bb5b5071793d847f1696a2ebe9e8cc0b042ae60b
F src/sqliteInt.h bd6be75bc43d38ada272ef0b3472bc44ef0cc15536bea22c349ca1a2812a19ce
@@ -1637,7 +1637,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8de20fc72a9b55fabd2444b2d73c88c65658430d6d182da9f0e2f3432373ab51
-R c47c127faead812067651b83dada496e
+P a98f07d942f0b8cc15da57b84e6340efae72ff19516fa04624242240af43a697
+R 53c56e6d1f80b263bf3b224af65051a5
U drh
-Z 6eb598623a458a3c2381353cdc4ead00
+Z c6c0754087fd0fc30d2a18fe11c0daa6
diff --git a/manifest.uuid b/manifest.uuid
index 984004928..466ad383d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a98f07d942f0b8cc15da57b84e6340efae72ff19516fa04624242240af43a697 \ No newline at end of file
+b1572d4e05934a0dc1b73092acba652fa50e97552eb6e9a1cedea7c71055804b \ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 597724191..ea002b720 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -3890,7 +3890,12 @@ typedef struct sqlite3_context sqlite3_context;
** host-language pointers into [application-defined SQL functions].
** ^A parameter that is initialized using [sqlite3_bind_pointer()] appears
** to be an ordinary SQL NULL value to everything other than
-** [sqlite3_value_pointer()]. The T parameter should be a static string.
+** [sqlite3_value_pointer()]. The T parameter should be a static string,
+** preferably a string literal. The procedure that invokes
+** sqlite3_bind_pointer(S,I,P,T) continues to own the P and T pointers and
+** must guarantee that those pointers remain valid until after the last
+** access via [sqlite3_value_pointer()]. The sqlite3_bind_pointer() routine
+** is part of the [pointer passing interface] added for SQLite 3.20.0.
**
** ^If any of the sqlite3_bind_*() routines are called with a NULL pointer
** for the [prepared statement] or with a prepared statement for which
@@ -5101,9 +5106,12 @@ typedef void (*sqlite3_destructor_type)(void*);
** also associates the host-language pointer P or type T with that
** NULL value such that the pointer can be retrieved within an
** [application-defined SQL function] using [sqlite3_value_pointer()].
-** The T parameter should be a static string.
-** This mechanism can be used to pass non-SQL values between
-** application-defined functions.
+** The T parameter should be a static string and preferably a string
+** literal. The procedure that invokes sqlite3_result_pointer(C,P,T)
+** continues to own the P and T pointers and must guarantee that
+** those pointers remain valid until after the last access via
+** [sqlite3_value_pointer()]. The sqlite3_result_pointer() routine
+** is part of the [pointer passing interface] added for SQLite 3.20.0.
**
** If these routines are called from within the different thread
** than the one containing the application-defined function that received