Fossil SCM

Updates to a slightly newer SQLite in an attempt to avoid a C89 declaration order issue.

drh 2020-08-08 01:44 trunk
Commit 0d813dbf91826ff266f63d44b15013a66da561b2c371373ef3df1a25dfe87fd5
Parent 08255208e98bb50…
3 files changed +2 -1 +2 -2 +1 -1
~ src/shell.c ~ src/sqlite3.c ~ src/sqlite3.h
M src/shell.c
+2 -1
--- src/shell.c
+++ src/shell.c
@@ -4994,11 +4994,10 @@
49944994
 sqlite3 *db,
49954995
 char **pzErrMsg,
49964996
 const sqlite3_api_routines *pApi
49974997
 ){
49984998
 int rc = SQLITE_OK;
4999
- SQLITE_EXTENSION_INIT2(pApi);
50004999
 static const struct {
50015000
 const char *zFuncName;
50025001
 int nArg;
50035002
 void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
50045003
 } aFunc[] = {
@@ -5008,10 +5007,12 @@
50085007
 { "decimal_sub", 2, decimalSubFunc },
50095008
 { "decimal_mul", 2, decimalMulFunc },
50105009
 };
50115010
 unsigned int i;
50125011
 (void)pzErrMsg; /* Unused parameter */
5012
+
5013
+ SQLITE_EXTENSION_INIT2(pApi);
50135014
50145015
 for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){
50155016
 rc = sqlite3_create_function(db, aFunc[i].zFuncName, aFunc[i].nArg,
50165017
 SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
50175018
 0, aFunc[i].xFunc, 0, 0);
50185019
--- src/shell.c
+++ src/shell.c
@@ -4994,11 +4994,10 @@
4994 sqlite3 *db,
4995 char **pzErrMsg,
4996 const sqlite3_api_routines *pApi
4997 ){
4998 int rc = SQLITE_OK;
4999 SQLITE_EXTENSION_INIT2(pApi);
5000 static const struct {
5001 const char *zFuncName;
5002 int nArg;
5003 void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
5004 } aFunc[] = {
@@ -5008,10 +5007,12 @@
5008 { "decimal_sub", 2, decimalSubFunc },
5009 { "decimal_mul", 2, decimalMulFunc },
5010 };
5011 unsigned int i;
5012 (void)pzErrMsg; /* Unused parameter */
 
 
5013
5014 for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){
5015 rc = sqlite3_create_function(db, aFunc[i].zFuncName, aFunc[i].nArg,
5016 SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
5017 0, aFunc[i].xFunc, 0, 0);
5018
--- src/shell.c
+++ src/shell.c
@@ -4994,11 +4994,10 @@
4994 sqlite3 *db,
4995 char **pzErrMsg,
4996 const sqlite3_api_routines *pApi
4997 ){
4998 int rc = SQLITE_OK;
 
4999 static const struct {
5000 const char *zFuncName;
5001 int nArg;
5002 void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
5003 } aFunc[] = {
@@ -5008,10 +5007,12 @@
5007 { "decimal_sub", 2, decimalSubFunc },
5008 { "decimal_mul", 2, decimalMulFunc },
5009 };
5010 unsigned int i;
5011 (void)pzErrMsg; /* Unused parameter */
5012
5013 SQLITE_EXTENSION_INIT2(pApi);
5014
5015 for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){
5016 rc = sqlite3_create_function(db, aFunc[i].zFuncName, aFunc[i].nArg,
5017 SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
5018 0, aFunc[i].xFunc, 0, 0);
5019
M src/sqlite3.c
+2 -2
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1162,11 +1162,11 @@
11621162
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
11631163
 ** [sqlite_version()] and [sqlite_source_id()].
11641164
 */
11651165
 #define SQLITE_VERSION "3.33.0"
11661166
 #define SQLITE_VERSION_NUMBER 3033000
1167
-#define SQLITE_SOURCE_ID "2020-08-07 19:52:01 fdc5fb902d7f2d10f73e64fe30c67153b59b26c5d707fc9c354e90967dbcc214"
1167
+#define SQLITE_SOURCE_ID "2020-08-08 00:44:45 eface2da2c0b3daee2a5fd640cca3d3757d0930f62900fc810c50c104635241d"
11681168
11691169
 /*
11701170
 ** CAPI3REF: Run-Time Library Version Numbers
11711171
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
11721172
 **
@@ -230477,10 +230477,10 @@
230477230477
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
230478230478
230479230479
 /************** End of stmt.c ************************************************/
230480230480
 #if __LINE__!=230480
230481230481
 #undef SQLITE_SOURCE_ID
230482
-#define SQLITE_SOURCE_ID "2020-08-07 19:52:01 fdc5fb902d7f2d10f73e64fe30c67153b59b26c5d707fc9c354e90967dbcalt2"
230482
+#define SQLITE_SOURCE_ID "2020-08-08 00:44:45 eface2da2c0b3daee2a5fd640cca3d3757d0930f62900fc810c50c104635alt2"
230483230483
 #endif
230484230484
 /* Return the source-id for this library */
230485230485
 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
230486230486
 /************************** End of sqlite3.c ******************************/
230487230487
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1162,11 +1162,11 @@
1162 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1163 ** [sqlite_version()] and [sqlite_source_id()].
1164 */
1165 #define SQLITE_VERSION "3.33.0"
1166 #define SQLITE_VERSION_NUMBER 3033000
1167 #define SQLITE_SOURCE_ID "2020-08-07 19:52:01 fdc5fb902d7f2d10f73e64fe30c67153b59b26c5d707fc9c354e90967dbcc214"
1168
1169 /*
1170 ** CAPI3REF: Run-Time Library Version Numbers
1171 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1172 **
@@ -230477,10 +230477,10 @@
230477 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
230478
230479 /************** End of stmt.c ************************************************/
230480 #if __LINE__!=230480
230481 #undef SQLITE_SOURCE_ID
230482 #define SQLITE_SOURCE_ID "2020-08-07 19:52:01 fdc5fb902d7f2d10f73e64fe30c67153b59b26c5d707fc9c354e90967dbcalt2"
230483 #endif
230484 /* Return the source-id for this library */
230485 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
230486 /************************** End of sqlite3.c ******************************/
230487
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1162,11 +1162,11 @@
1162 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1163 ** [sqlite_version()] and [sqlite_source_id()].
1164 */
1165 #define SQLITE_VERSION "3.33.0"
1166 #define SQLITE_VERSION_NUMBER 3033000
1167 #define SQLITE_SOURCE_ID "2020-08-08 00:44:45 eface2da2c0b3daee2a5fd640cca3d3757d0930f62900fc810c50c104635241d"
1168
1169 /*
1170 ** CAPI3REF: Run-Time Library Version Numbers
1171 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1172 **
@@ -230477,10 +230477,10 @@
230477 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
230478
230479 /************** End of stmt.c ************************************************/
230480 #if __LINE__!=230480
230481 #undef SQLITE_SOURCE_ID
230482 #define SQLITE_SOURCE_ID "2020-08-08 00:44:45 eface2da2c0b3daee2a5fd640cca3d3757d0930f62900fc810c50c104635alt2"
230483 #endif
230484 /* Return the source-id for this library */
230485 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
230486 /************************** End of sqlite3.c ******************************/
230487
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
123123
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124124
 ** [sqlite_version()] and [sqlite_source_id()].
125125
 */
126126
 #define SQLITE_VERSION "3.33.0"
127127
 #define SQLITE_VERSION_NUMBER 3033000
128
-#define SQLITE_SOURCE_ID "2020-08-07 19:52:01 fdc5fb902d7f2d10f73e64fe30c67153b59b26c5d707fc9c354e90967dbcc214"
128
+#define SQLITE_SOURCE_ID "2020-08-08 00:44:45 eface2da2c0b3daee2a5fd640cca3d3757d0930f62900fc810c50c104635241d"
129129
130130
 /*
131131
 ** CAPI3REF: Run-Time Library Version Numbers
132132
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133133
 **
134134
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
123 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124 ** [sqlite_version()] and [sqlite_source_id()].
125 */
126 #define SQLITE_VERSION "3.33.0"
127 #define SQLITE_VERSION_NUMBER 3033000
128 #define SQLITE_SOURCE_ID "2020-08-07 19:52:01 fdc5fb902d7f2d10f73e64fe30c67153b59b26c5d707fc9c354e90967dbcc214"
129
130 /*
131 ** CAPI3REF: Run-Time Library Version Numbers
132 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133 **
134
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
123 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124 ** [sqlite_version()] and [sqlite_source_id()].
125 */
126 #define SQLITE_VERSION "3.33.0"
127 #define SQLITE_VERSION_NUMBER 3033000
128 #define SQLITE_SOURCE_ID "2020-08-08 00:44:45 eface2da2c0b3daee2a5fd640cca3d3757d0930f62900fc810c50c104635241d"
129
130 /*
131 ** CAPI3REF: Run-Time Library Version Numbers
132 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133 **
134

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button