From: drh <drh@noemail.net>
Date: Mon, 17 Jul 2017 12:41:29 +0000 (+0000)
Subject: Comment changes clarifying details of the pointer-type parameter.  No
X-Git-Tag: version-3.20.0~36^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aabebc27b7c3db1d3d138df86f73918427bd1356;p=thirdparty%2Fsqlite.git

Comment changes clarifying details of the pointer-type parameter.  No
changes to code.

FossilOrigin-Name: e4579e50a1ece4f65dfdae39d5c1670f0e3f7d4824e7d242f07ec9859d15155f
---

diff --git a/ext/misc/remember.c b/ext/misc/remember.c
index b6ab2af253..18f6edec9d 100644
--- a/ext/misc/remember.c
+++ b/ext/misc/remember.c
@@ -25,6 +25,9 @@
 ** pointer type of "carray" and bind the id of the counter to $ID and
 ** run the prepared statement.
 **
+** This implementation of the remember() function uses a "carray"
+** pointer so that it can share pointers with the carray() extension.
+**
 ** One can imagine doing similar things with floating-point values and
 ** strings, but this demonstration extension will stick to using just
 ** integers.
diff --git a/manifest b/manifest
index 25554f8098..ed838f39b2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\spointer-type\sparameter\sto\ssqlite3_bind_pointer(),\nsqlite3_result_pointer(),\sand\ssqlite3_value_pointer().\s\sThe\spointer\stype\sis\na\sstatic\sstring\sthat\smust\smatch\s(according\sto\sstrcmp())\sor\selse\sthe\spointer\nis\spassed\sas\sa\sNULL.\s\sThis\sis\sa\ssecurity\smeasure\sto\sprevent\scrossing\spointers\nbetween\sdifferent\sextensions.
-D 2017-07-17T12:27:43.686
+C Comment\schanges\sclarifying\sdetails\sof\sthe\spointer-type\sparameter.\s\sNo\nchanges\sto\scode.
+D 2017-07-17T12:41:29.874
 F Makefile.in eda8bedf08c4c93e2137ef1218b3d3302488c68c2774918de0335a1133aab157
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba
@@ -271,7 +271,7 @@ F ext/misc/memvfs.c e5225bc22e79dde6b28380f3a068ddf600683a33
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
 F ext/misc/percentile.c 92699c8cd7d517ff610e6037e56506f8904dae2e
 F ext/misc/regexp.c a68d25c659bd2d893cd1215667bbf75ecb9dc7d4
-F ext/misc/remember.c 9b9e220ca9d08466508018a9643d4a367bc03bb038d5213c21f70ab74bfc7f20
+F ext/misc/remember.c add730f0f7e7436cd15ea3fd6a90fd83c3f706ab44169f7f048438b7d6baa69c
 F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a
 F ext/misc/scrub.c 1c5bfb8b0cd18b602fcb55755e84abf0023ac2fb
 F ext/misc/series.c b0f5f346aca9b7ff7caaf0da2efb4ad462441abd4dcd92a460cb573b3ea2370b
@@ -454,7 +454,7 @@ F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 95659b7990e390f9bd8dc30b8975c675fcd1d46e569bc4f5a14e22a8d03e3d14
 F src/shell.c e89ad1135cb47c95896a1aec4bd0113af90a057d80f20003f354fa56fc10a616
 F src/shell.c.in dae43a6a43988d955014f070341f296561ea4a43ca2685166a32495b0667ef59
-F src/sqlite.h.in 07edd8c96112acb8b8f5e4a6d0c404bef0796484cd1d28408f6ec7a4b3f96f97
+F src/sqlite.h.in dad804d4e1979a2ddec33cc8da6aa50c04e6ba0dcb4058e7b3609588d010e041
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 967154985ed2ae62f90d9029bb5b5071793d847f1696a2ebe9e8cc0b042ae60b
 F src/sqliteInt.h 0ba730cdc8afa723a5642380712f8bb33abd6a69218571c18b94acf3562de22a
@@ -1633,8 +1633,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 b64d64c84484162d1822430036ba0483365a39ef4cf82cd6a7b9436d9e9f50c8 c13264d5ef0470fb24e09f7bc12f19be3b77eab06d41f55607b38dddb532a132
-R b5069fb289c149b1ae5393ff07d0ac4e
-T +closed c13264d5ef0470fb24e09f7bc12f19be3b77eab06d41f55607b38dddb532a132
+P e1196567fcbc313657836262ed9f71668b1c47f26e4bc57c7880ff40079d66cc
+R 44ab723208e3fb1d41d5a4d6b1798a34
 U drh
-Z 925d3dfda59d7030b45ae8209211f32c
+Z e0af31851383293468c221b16ac511da
diff --git a/manifest.uuid b/manifest.uuid
index e7ee9715e2..ad53d8b0ee 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e1196567fcbc313657836262ed9f71668b1c47f26e4bc57c7880ff40079d66cc
\ No newline at end of file
+e4579e50a1ece4f65dfdae39d5c1670f0e3f7d4824e7d242f07ec9859d15155f
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 4b3b0bc814..427b6f747e 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -3890,7 +3890,7 @@ 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()].
+** [sqlite3_value_pointer()].  The T parameter should be a static string.
 **
 ** ^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,6 +5101,7 @@ 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.
 **