From: drh <drh@noemail.net>
Date: Fri, 1 Mar 2013 23:40:26 +0000 (+0000)
Subject: Complete the initialization of the loadable extension thunk table.  Also
X-Git-Tag: version-3.7.16~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d59d036de87114adc03d48c4ba817cc21dc350b;p=thirdparty%2Fsqlite.git

Complete the initialization of the loadable extension thunk table.  Also
fix other (harmless) compiler warnings.

FossilOrigin-Name: 780d06c5e54590f677f993fa9c313989c2eab8c7
---

diff --git a/manifest b/manifest
index bf449307b2..7bd0348f28 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\scygwin\sinterface\sto\suse\sthe\snewer\s1.7\sAPIs\sinstead\sof\sthe\n1.5\sAPIs.\s\sAlso\sshorten\sover-length\ssource\scode\slines\sin\sos_win.c.
-D 2013-03-01T23:24:04.416
+C Complete\sthe\sinitialization\sof\sthe\sloadable\sextension\sthunk\stable.\s\sAlso\nfix\sother\s(harmless)\scompiler\swarnings.
+D 2013-03-01T23:40:26.913
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -133,7 +133,7 @@ F src/delete.c 9b8d308979114991e5dc7cee958316e07186941d
 F src/expr.c a23b4aac2a455b2e76b55bef5dcfbe62b665375c
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
-F src/func.c b45b6a171511e3a8e50bf6f8503e54a76f608e02
+F src/func.c 91bc65eb68ef6cf29198aac92f11489fa85a8de4
 F src/global.c e59ecd2c553ad0d4bfbc84ca71231336f8993a7a
 F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@@ -142,7 +142,7 @@ F src/insert.c f7cb141e8ce257cb6b15c497f09e4e23d6055599
 F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
-F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
+F src/loadext.c 1422eba4aa2b1fb5f7b3aef574752272477d21e2
 F src/main.c 8d204866d1abf5100503dcd54d3187b88f6846b7
 F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
@@ -218,7 +218,7 @@ F src/test_osinst.c 90a845c8183013d80eccb1f29e8805608516edba
 F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
 F src/test_quota.c 1ec82e02fd3643899e9a5de9684515e84641c91f
 F src/test_quota.h 8761e463b25e75ebc078bd67d70e39b9c817a0cb
-F src/test_regexp.c 08748a68ddb3b29329dbdade5ede849a749f0c07
+F src/test_regexp.c 5ff0eafd66c9a209417142fa319006f7028fbda8
 F src/test_rtree.c aba603c949766c4193f1068b91c787f57274e0d9
 F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
 F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
@@ -1036,7 +1036,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P c9c2b82c86fff457a0b32d5be84ec66639065ae1
-R f939bbf001afa25b994d8ca6deefd57b
+P 6b2838336a31e34c540210ccc9c934d4ba94757c
+R db69dd670ef335759c7475908d848a42
 U drh
-Z d24cb65108217f32a1099dd98d4c4743
+Z d35d3652e81b05a9c2009fdff0b4ddbd
diff --git a/manifest.uuid b/manifest.uuid
index a06a7efc72..235d98e3ca 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6b2838336a31e34c540210ccc9c934d4ba94757c
\ No newline at end of file
+780d06c5e54590f677f993fa9c313989c2eab8c7
\ No newline at end of file
diff --git a/src/func.c b/src/func.c
index 09453b3c63..56cd6052b4 100644
--- a/src/func.c
+++ b/src/func.c
@@ -972,6 +972,7 @@ static void unicodeFunc(
   sqlite3_value **argv
 ){
   const unsigned char *z = sqlite3_value_text(argv[0]);
+  (void)argc;
   if( z && z[0] ) sqlite3_result_int(context, sqlite3Utf8Read(&z));
 }
 
diff --git a/src/loadext.c b/src/loadext.c
index 3fcf5008cf..76450f2e8b 100644
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -378,6 +378,19 @@ static const sqlite3_api_routines sqlite3Apis = {
   sqlite3_blob_reopen,
   sqlite3_vtab_config,
   sqlite3_vtab_on_conflict,
+  sqlite3_close_v2,
+  sqlite3_db_filename,
+  sqlite3_db_readonly,
+  sqlite3_db_release_memory,
+  sqlite3_errstr,
+  sqlite3_stmt_busy,
+  sqlite3_stmt_readonly,
+  sqlite3_stricmp,
+  sqlite3_uri_boolean,
+  sqlite3_uri_int64,
+  sqlite3_uri_parameter,
+  sqlite3_vsnprintf,
+  sqlite3_wal_checkpoint_v2
 };
 
 /*
diff --git a/src/test_regexp.c b/src/test_regexp.c
index 2cebbea44a..a1969ada40 100644
--- a/src/test_regexp.c
+++ b/src/test_regexp.c
@@ -107,7 +107,7 @@ struct ReCompiled {
   char *aOp;                  /* Operators for the virtual machine */
   int *aArg;                  /* Arguments to each operator */
   unsigned (*xNextChar)(ReInput*);  /* Next character function */
-  char zInit[12];             /* Initial text to match */
+  unsigned char zInit[12];    /* Initial text to match */
   int nInit;                  /* Number of characters in zInit */
   unsigned nState;            /* Number of entries in aOp[] and aArg[] */
   unsigned nAlloc;            /* Slots allocated for aOp[] and aArg[] */
@@ -194,7 +194,8 @@ int re_match(ReCompiled *pRe, const unsigned char *zIn, int nIn){
   if( pRe->nInit ){
     unsigned char x = pRe->zInit[0];
     while( in.i+pRe->nInit<=in.mx 
-        && (zIn[in.i]!=x || strncmp(zIn+in.i, pRe->zInit, pRe->nInit)!=0)
+     && (zIn[in.i]!=x ||
+         strncmp((const char*)zIn+in.i, (const char*)pRe->zInit, pRe->nInit)!=0)
     ){
       in.i++;
     }