Fossil SCM

Another SQLite update to fix the build on older machines that lack CHAR_BITS as well as to fix a few harmless compiler warnings.

drh 2021-09-22 14:45 trunk
Commit 457a73e6adcf66f3306b0ca80f95351b6a1545b34af4ab856851f542e3cef219
Parent 606dcf08c94e4a1…
3 files changed +4 +3 -3 +1 -1
~ src/shell.c ~ src/sqlite3.c ~ src/sqlite3.h
M src/shell.c
+4
--- src/shell.c
+++ src/shell.c
@@ -10154,10 +10154,11 @@
1015410154
 * The first argument is expected to be an int*, referent to be incremented
1015510155
 * if that leading column is not exactly '0'.
1015610156
 */
1015710157
 static int countNonzeros(void* pCount, int nc,
1015810158
 char* azResults[], char* azColumns[]){
10159
+ (void)azColumns; /* Suppress unused parameter warning */
1015910160
 if( nc>0 && (azResults[0][0]!='0' || azResults[0][1]!=0) ){
1016010161
 *((int *)pCount) += 1;
1016110162
 }
1016210163
 return 0;
1016310164
 }
@@ -21649,10 +21650,13 @@
2164921650
 return rc;
2165021651
 }
2165121652
2165221653
 /* Line scan result and intermediate states (supporting scan resumption)
2165321654
 */
21655
+#ifndef CHAR_BIT
21656
+# define CHAR_BIT 8
21657
+#endif
2165421658
 typedef enum {
2165521659
 QSS_HasDark = 1<<CHAR_BIT, QSS_EndingSemi = 2<<CHAR_BIT,
2165621660
 QSS_CharMask = (1<<CHAR_BIT)-1, QSS_ScanMask = 3<<CHAR_BIT,
2165721661
 QSS_Start = 0
2165821662
 } QuickScanState;
2165921663
--- src/shell.c
+++ src/shell.c
@@ -10154,10 +10154,11 @@
10154 * The first argument is expected to be an int*, referent to be incremented
10155 * if that leading column is not exactly '0'.
10156 */
10157 static int countNonzeros(void* pCount, int nc,
10158 char* azResults[], char* azColumns[]){
 
10159 if( nc>0 && (azResults[0][0]!='0' || azResults[0][1]!=0) ){
10160 *((int *)pCount) += 1;
10161 }
10162 return 0;
10163 }
@@ -21649,10 +21650,13 @@
21649 return rc;
21650 }
21651
21652 /* Line scan result and intermediate states (supporting scan resumption)
21653 */
 
 
 
21654 typedef enum {
21655 QSS_HasDark = 1<<CHAR_BIT, QSS_EndingSemi = 2<<CHAR_BIT,
21656 QSS_CharMask = (1<<CHAR_BIT)-1, QSS_ScanMask = 3<<CHAR_BIT,
21657 QSS_Start = 0
21658 } QuickScanState;
21659
--- src/shell.c
+++ src/shell.c
@@ -10154,10 +10154,11 @@
10154 * The first argument is expected to be an int*, referent to be incremented
10155 * if that leading column is not exactly '0'.
10156 */
10157 static int countNonzeros(void* pCount, int nc,
10158 char* azResults[], char* azColumns[]){
10159 (void)azColumns; /* Suppress unused parameter warning */
10160 if( nc>0 && (azResults[0][0]!='0' || azResults[0][1]!=0) ){
10161 *((int *)pCount) += 1;
10162 }
10163 return 0;
10164 }
@@ -21649,10 +21650,13 @@
21650 return rc;
21651 }
21652
21653 /* Line scan result and intermediate states (supporting scan resumption)
21654 */
21655 #ifndef CHAR_BIT
21656 # define CHAR_BIT 8
21657 #endif
21658 typedef enum {
21659 QSS_HasDark = 1<<CHAR_BIT, QSS_EndingSemi = 2<<CHAR_BIT,
21660 QSS_CharMask = (1<<CHAR_BIT)-1, QSS_ScanMask = 3<<CHAR_BIT,
21661 QSS_Start = 0
21662 } QuickScanState;
21663
M src/sqlite3.c
+3 -3
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -452,11 +452,11 @@
452452
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
453453
 ** [sqlite_version()] and [sqlite_source_id()].
454454
 */
455455
 #define SQLITE_VERSION "3.37.0"
456456
 #define SQLITE_VERSION_NUMBER 3037000
457
-#define SQLITE_SOURCE_ID "2021-09-22 13:43:16 56da0e9c0321d1fd3c360722cd6284296f9ba459f6b37ab35c81ecabd18f12e3"
457
+#define SQLITE_SOURCE_ID "2021-09-22 14:43:35 d678ecca02698753d1b33e072566112e94ea36d0d3a8f4a24d2b09d131968d88"
458458
459459
 /*
460460
 ** CAPI3REF: Run-Time Library Version Numbers
461461
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
462462
 **
@@ -222569,11 +222569,11 @@
222569222569
 int i;
222570222570
 memcpy(pNew, p, nByte);
222571222571
 for(i=0; i<p->nLevel; i++) pNew->aLevel[i].aSeg = 0;
222572222572
 for(i=0; i<p->nLevel; i++){
222573222573
 Fts5StructureLevel *pLvl = &pNew->aLevel[i];
222574
- int nByte = sizeof(Fts5StructureSegment) * pNew->aLevel[i].nSeg;
222574
+ nByte = sizeof(Fts5StructureSegment) * pNew->aLevel[i].nSeg;
222575222575
 pLvl->aSeg = (Fts5StructureSegment*)sqlite3Fts5MallocZero(pRc, nByte);
222576222576
 if( pLvl->aSeg==0 ){
222577222577
 for(i=0; i<p->nLevel; i++){
222578222578
 sqlite3_free(pNew->aLevel[i].aSeg);
222579222579
 }
@@ -231295,11 +231295,11 @@
231295231295
 int nArg, /* Number of args */
231296231296
 sqlite3_value **apUnused /* Function arguments */
231297231297
 ){
231298231298
 assert( nArg==0 );
231299231299
 UNUSED_PARAM2(nArg, apUnused);
231300
- sqlite3_result_text(pCtx, "fts5: 2021-09-22 13:43:16 56da0e9c0321d1fd3c360722cd6284296f9ba459f6b37ab35c81ecabd18f12e3", -1, SQLITE_TRANSIENT);
231300
+ sqlite3_result_text(pCtx, "fts5: 2021-09-22 14:43:35 d678ecca02698753d1b33e072566112e94ea36d0d3a8f4a24d2b09d131968d88", -1, SQLITE_TRANSIENT);
231301231301
 }
231302231302
231303231303
 /*
231304231304
 ** Return true if zName is the extension on one of the shadow tables used
231305231305
 ** by this module.
231306231306
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -452,11 +452,11 @@
452 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
453 ** [sqlite_version()] and [sqlite_source_id()].
454 */
455 #define SQLITE_VERSION "3.37.0"
456 #define SQLITE_VERSION_NUMBER 3037000
457 #define SQLITE_SOURCE_ID "2021-09-22 13:43:16 56da0e9c0321d1fd3c360722cd6284296f9ba459f6b37ab35c81ecabd18f12e3"
458
459 /*
460 ** CAPI3REF: Run-Time Library Version Numbers
461 ** KEYWORDS: sqlite3_version sqlite3_sourceid
462 **
@@ -222569,11 +222569,11 @@
222569 int i;
222570 memcpy(pNew, p, nByte);
222571 for(i=0; i<p->nLevel; i++) pNew->aLevel[i].aSeg = 0;
222572 for(i=0; i<p->nLevel; i++){
222573 Fts5StructureLevel *pLvl = &pNew->aLevel[i];
222574 int nByte = sizeof(Fts5StructureSegment) * pNew->aLevel[i].nSeg;
222575 pLvl->aSeg = (Fts5StructureSegment*)sqlite3Fts5MallocZero(pRc, nByte);
222576 if( pLvl->aSeg==0 ){
222577 for(i=0; i<p->nLevel; i++){
222578 sqlite3_free(pNew->aLevel[i].aSeg);
222579 }
@@ -231295,11 +231295,11 @@
231295 int nArg, /* Number of args */
231296 sqlite3_value **apUnused /* Function arguments */
231297 ){
231298 assert( nArg==0 );
231299 UNUSED_PARAM2(nArg, apUnused);
231300 sqlite3_result_text(pCtx, "fts5: 2021-09-22 13:43:16 56da0e9c0321d1fd3c360722cd6284296f9ba459f6b37ab35c81ecabd18f12e3", -1, SQLITE_TRANSIENT);
231301 }
231302
231303 /*
231304 ** Return true if zName is the extension on one of the shadow tables used
231305 ** by this module.
231306
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -452,11 +452,11 @@
452 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
453 ** [sqlite_version()] and [sqlite_source_id()].
454 */
455 #define SQLITE_VERSION "3.37.0"
456 #define SQLITE_VERSION_NUMBER 3037000
457 #define SQLITE_SOURCE_ID "2021-09-22 14:43:35 d678ecca02698753d1b33e072566112e94ea36d0d3a8f4a24d2b09d131968d88"
458
459 /*
460 ** CAPI3REF: Run-Time Library Version Numbers
461 ** KEYWORDS: sqlite3_version sqlite3_sourceid
462 **
@@ -222569,11 +222569,11 @@
222569 int i;
222570 memcpy(pNew, p, nByte);
222571 for(i=0; i<p->nLevel; i++) pNew->aLevel[i].aSeg = 0;
222572 for(i=0; i<p->nLevel; i++){
222573 Fts5StructureLevel *pLvl = &pNew->aLevel[i];
222574 nByte = sizeof(Fts5StructureSegment) * pNew->aLevel[i].nSeg;
222575 pLvl->aSeg = (Fts5StructureSegment*)sqlite3Fts5MallocZero(pRc, nByte);
222576 if( pLvl->aSeg==0 ){
222577 for(i=0; i<p->nLevel; i++){
222578 sqlite3_free(pNew->aLevel[i].aSeg);
222579 }
@@ -231295,11 +231295,11 @@
231295 int nArg, /* Number of args */
231296 sqlite3_value **apUnused /* Function arguments */
231297 ){
231298 assert( nArg==0 );
231299 UNUSED_PARAM2(nArg, apUnused);
231300 sqlite3_result_text(pCtx, "fts5: 2021-09-22 14:43:35 d678ecca02698753d1b33e072566112e94ea36d0d3a8f4a24d2b09d131968d88", -1, SQLITE_TRANSIENT);
231301 }
231302
231303 /*
231304 ** Return true if zName is the extension on one of the shadow tables used
231305 ** by this module.
231306
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -146,11 +146,11 @@
146146
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147147
 ** [sqlite_version()] and [sqlite_source_id()].
148148
 */
149149
 #define SQLITE_VERSION "3.37.0"
150150
 #define SQLITE_VERSION_NUMBER 3037000
151
-#define SQLITE_SOURCE_ID "2021-09-22 13:43:16 56da0e9c0321d1fd3c360722cd6284296f9ba459f6b37ab35c81ecabd18f12e3"
151
+#define SQLITE_SOURCE_ID "2021-09-22 14:43:35 d678ecca02698753d1b33e072566112e94ea36d0d3a8f4a24d2b09d131968d88"
152152
153153
 /*
154154
 ** CAPI3REF: Run-Time Library Version Numbers
155155
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
156156
 **
157157
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -146,11 +146,11 @@
146 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147 ** [sqlite_version()] and [sqlite_source_id()].
148 */
149 #define SQLITE_VERSION "3.37.0"
150 #define SQLITE_VERSION_NUMBER 3037000
151 #define SQLITE_SOURCE_ID "2021-09-22 13:43:16 56da0e9c0321d1fd3c360722cd6284296f9ba459f6b37ab35c81ecabd18f12e3"
152
153 /*
154 ** CAPI3REF: Run-Time Library Version Numbers
155 ** KEYWORDS: sqlite3_version sqlite3_sourceid
156 **
157
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -146,11 +146,11 @@
146 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147 ** [sqlite_version()] and [sqlite_source_id()].
148 */
149 #define SQLITE_VERSION "3.37.0"
150 #define SQLITE_VERSION_NUMBER 3037000
151 #define SQLITE_SOURCE_ID "2021-09-22 14:43:35 d678ecca02698753d1b33e072566112e94ea36d0d3a8f4a24d2b09d131968d88"
152
153 /*
154 ** CAPI3REF: Run-Time Library Version Numbers
155 ** KEYWORDS: sqlite3_version sqlite3_sourceid
156 **
157

Keyboard Shortcuts

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