Fossil SCM

Update to the latest SQLite in order to fix compiler warnings.

drh 2022-01-31 16:30 trunk
Commit 52b0272fda7ec17146cbc7737e5a417a5f445d7a9563450144085478fa06b78f
Parent 100118cb91f1239…
3 files changed +6 -6 +3 -2 +1 -1
~ extsrc/shell.c ~ extsrc/sqlite3.c ~ extsrc/sqlite3.h
M extsrc/shell.c
+6 -6
--- extsrc/shell.c
+++ extsrc/shell.c
@@ -14389,12 +14389,12 @@
1438914389
 nAlloc = nColumn*4;
1439014390
 if( nAlloc<=0 ) nAlloc = 1;
1439114391
 azData = sqlite3_malloc64( nAlloc*sizeof(char*) );
1439214392
 shell_check_oom(azData);
1439314393
 azNextLine = sqlite3_malloc64( nColumn*sizeof(char*) );
14394
- shell_check_oom(azNextLine);
14395
- memset(azNextLine, 0, nColumn*sizeof(char*) );
14394
+ shell_check_oom((void*)azNextLine);
14395
+ memset((void*)azNextLine, 0, nColumn*sizeof(char*) );
1439614396
 if( p->bQuote ){
1439714397
 azQuoted = sqlite3_malloc64( nColumn*sizeof(char*) );
1439814398
 shell_check_oom(azQuoted);
1439914399
 memset(azQuoted, 0, nColumn*sizeof(char*) );
1440014400
 }
@@ -14427,22 +14427,22 @@
1442714427
 shell_check_oom(abRowDiv);
1442814428
 }
1442914429
 abRowDiv[nRow] = 1;
1443014430
 nRow++;
1443114431
 for(i=0; i<nColumn; i++){
14432
- int w = p->colWidth[i];
14433
- if( w==0 ) w = p->iWrap;
14432
+ int wx = p->colWidth[i];
14433
+ if( wx==0 ) wx = p->iWrap;
1443414434
 if( useNextLine ){
1443514435
 uz = azNextLine[i];
1443614436
 }else if( p->bQuote ){
1443714437
 sqlite3_free(azQuoted[i]);
1443814438
 azQuoted[i] = quoted_column(pStmt,i);
1443914439
 uz = (const unsigned char*)azQuoted[i];
1444014440
 }else{
1444114441
 uz = (const unsigned char*)sqlite3_column_text(pStmt,i);
1444214442
 }
14443
- azData[nRow*nColumn + i] = translateForDisplayAndDup(uz, &azNextLine[i], w);
14443
+ azData[nRow*nColumn + i] = translateForDisplayAndDup(uz, &azNextLine[i], wx);
1444414444
 if( azNextLine[i] ){
1444514445
 bNextLine = 1;
1444614446
 abRowDiv[nRow-1] = 0;
1444714447
 bMultiLineRowExists = 1;
1444814448
 }
@@ -14553,11 +14553,11 @@
1455314553
 utf8_printf(p->out, "Interrupt\n");
1455414554
 }
1455514555
 nData = (nRow+1)*nColumn;
1455614556
 for(i=0; i<nData; i++) free(azData[i]);
1455714557
 sqlite3_free(azData);
14558
- sqlite3_free(azNextLine);
14558
+ sqlite3_free((void*)azNextLine);
1455914559
 sqlite3_free(abRowDiv);
1456014560
 if( azQuoted ){
1456114561
 for(i=0; i<nColumn; i++) sqlite3_free(azQuoted[i]);
1456214562
 sqlite3_free(azQuoted);
1456314563
 }
1456414564
--- extsrc/shell.c
+++ extsrc/shell.c
@@ -14389,12 +14389,12 @@
14389 nAlloc = nColumn*4;
14390 if( nAlloc<=0 ) nAlloc = 1;
14391 azData = sqlite3_malloc64( nAlloc*sizeof(char*) );
14392 shell_check_oom(azData);
14393 azNextLine = sqlite3_malloc64( nColumn*sizeof(char*) );
14394 shell_check_oom(azNextLine);
14395 memset(azNextLine, 0, nColumn*sizeof(char*) );
14396 if( p->bQuote ){
14397 azQuoted = sqlite3_malloc64( nColumn*sizeof(char*) );
14398 shell_check_oom(azQuoted);
14399 memset(azQuoted, 0, nColumn*sizeof(char*) );
14400 }
@@ -14427,22 +14427,22 @@
14427 shell_check_oom(abRowDiv);
14428 }
14429 abRowDiv[nRow] = 1;
14430 nRow++;
14431 for(i=0; i<nColumn; i++){
14432 int w = p->colWidth[i];
14433 if( w==0 ) w = p->iWrap;
14434 if( useNextLine ){
14435 uz = azNextLine[i];
14436 }else if( p->bQuote ){
14437 sqlite3_free(azQuoted[i]);
14438 azQuoted[i] = quoted_column(pStmt,i);
14439 uz = (const unsigned char*)azQuoted[i];
14440 }else{
14441 uz = (const unsigned char*)sqlite3_column_text(pStmt,i);
14442 }
14443 azData[nRow*nColumn + i] = translateForDisplayAndDup(uz, &azNextLine[i], w);
14444 if( azNextLine[i] ){
14445 bNextLine = 1;
14446 abRowDiv[nRow-1] = 0;
14447 bMultiLineRowExists = 1;
14448 }
@@ -14553,11 +14553,11 @@
14553 utf8_printf(p->out, "Interrupt\n");
14554 }
14555 nData = (nRow+1)*nColumn;
14556 for(i=0; i<nData; i++) free(azData[i]);
14557 sqlite3_free(azData);
14558 sqlite3_free(azNextLine);
14559 sqlite3_free(abRowDiv);
14560 if( azQuoted ){
14561 for(i=0; i<nColumn; i++) sqlite3_free(azQuoted[i]);
14562 sqlite3_free(azQuoted);
14563 }
14564
--- extsrc/shell.c
+++ extsrc/shell.c
@@ -14389,12 +14389,12 @@
14389 nAlloc = nColumn*4;
14390 if( nAlloc<=0 ) nAlloc = 1;
14391 azData = sqlite3_malloc64( nAlloc*sizeof(char*) );
14392 shell_check_oom(azData);
14393 azNextLine = sqlite3_malloc64( nColumn*sizeof(char*) );
14394 shell_check_oom((void*)azNextLine);
14395 memset((void*)azNextLine, 0, nColumn*sizeof(char*) );
14396 if( p->bQuote ){
14397 azQuoted = sqlite3_malloc64( nColumn*sizeof(char*) );
14398 shell_check_oom(azQuoted);
14399 memset(azQuoted, 0, nColumn*sizeof(char*) );
14400 }
@@ -14427,22 +14427,22 @@
14427 shell_check_oom(abRowDiv);
14428 }
14429 abRowDiv[nRow] = 1;
14430 nRow++;
14431 for(i=0; i<nColumn; i++){
14432 int wx = p->colWidth[i];
14433 if( wx==0 ) wx = p->iWrap;
14434 if( useNextLine ){
14435 uz = azNextLine[i];
14436 }else if( p->bQuote ){
14437 sqlite3_free(azQuoted[i]);
14438 azQuoted[i] = quoted_column(pStmt,i);
14439 uz = (const unsigned char*)azQuoted[i];
14440 }else{
14441 uz = (const unsigned char*)sqlite3_column_text(pStmt,i);
14442 }
14443 azData[nRow*nColumn + i] = translateForDisplayAndDup(uz, &azNextLine[i], wx);
14444 if( azNextLine[i] ){
14445 bNextLine = 1;
14446 abRowDiv[nRow-1] = 0;
14447 bMultiLineRowExists = 1;
14448 }
@@ -14553,11 +14553,11 @@
14553 utf8_printf(p->out, "Interrupt\n");
14554 }
14555 nData = (nRow+1)*nColumn;
14556 for(i=0; i<nData; i++) free(azData[i]);
14557 sqlite3_free(azData);
14558 sqlite3_free((void*)azNextLine);
14559 sqlite3_free(abRowDiv);
14560 if( azQuoted ){
14561 for(i=0; i<nColumn; i++) sqlite3_free(azQuoted[i]);
14562 sqlite3_free(azQuoted);
14563 }
14564
M extsrc/sqlite3.c
+3 -2
--- extsrc/sqlite3.c
+++ extsrc/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.38.0"
456456
 #define SQLITE_VERSION_NUMBER 3038000
457
-#define SQLITE_SOURCE_ID "2022-01-31 14:14:29 539cef5214446a7181614793e9cf323e95ba00ba0f888585b14b598dd2ff0808"
457
+#define SQLITE_SOURCE_ID "2022-01-31 16:29:06 3ec6141c41a71eea0d96a65aa35c828e4d852d60e090513c312b925d0e257f9a"
458458
459459
 /*
460460
 ** CAPI3REF: Run-Time Library Version Numbers
461461
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
462462
 **
@@ -157189,10 +157189,11 @@
157189157189
 testcase( pWInfo->eOnePass==ONEPASS_OFF && pTab->nCol==BMS-1 );
157190157190
 testcase( pWInfo->eOnePass==ONEPASS_OFF && pTab->nCol==BMS );
157191157191
 if( pWInfo->eOnePass==ONEPASS_OFF
157192157192
 && pTab->nCol<BMS
157193157193
 && (pTab->tabFlags & (TF_HasGenerated|TF_WithoutRowid))==0
157194
+ && (pLoop->wsFlags & (WHERE_AUTO_INDEX|WHERE_BLOOMFILTER))==0
157194157195
 ){
157195157196
 /* If we know that only a prefix of the record will be used,
157196157197
 ** it is advantageous to reduce the "column count" field in
157197157198
 ** the P4 operand of the OP_OpenRead/Write opcode. */
157198157199
 Bitmask b = pTabItem->colUsed;
@@ -233818,11 +233819,11 @@
233818233819
 int nArg, /* Number of args */
233819233820
 sqlite3_value **apUnused /* Function arguments */
233820233821
 ){
233821233822
 assert( nArg==0 );
233822233823
 UNUSED_PARAM2(nArg, apUnused);
233823
- sqlite3_result_text(pCtx, "fts5: 2022-01-31 14:14:29 539cef5214446a7181614793e9cf323e95ba00ba0f888585b14b598dd2ff0808", -1, SQLITE_TRANSIENT);
233824
+ sqlite3_result_text(pCtx, "fts5: 2022-01-31 16:29:06 3ec6141c41a71eea0d96a65aa35c828e4d852d60e090513c312b925d0e257f9a", -1, SQLITE_TRANSIENT);
233824233825
 }
233825233826
233826233827
 /*
233827233828
 ** Return true if zName is the extension on one of the shadow tables used
233828233829
 ** by this module.
233829233830
--- extsrc/sqlite3.c
+++ extsrc/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.38.0"
456 #define SQLITE_VERSION_NUMBER 3038000
457 #define SQLITE_SOURCE_ID "2022-01-31 14:14:29 539cef5214446a7181614793e9cf323e95ba00ba0f888585b14b598dd2ff0808"
458
459 /*
460 ** CAPI3REF: Run-Time Library Version Numbers
461 ** KEYWORDS: sqlite3_version sqlite3_sourceid
462 **
@@ -157189,10 +157189,11 @@
157189 testcase( pWInfo->eOnePass==ONEPASS_OFF && pTab->nCol==BMS-1 );
157190 testcase( pWInfo->eOnePass==ONEPASS_OFF && pTab->nCol==BMS );
157191 if( pWInfo->eOnePass==ONEPASS_OFF
157192 && pTab->nCol<BMS
157193 && (pTab->tabFlags & (TF_HasGenerated|TF_WithoutRowid))==0
 
157194 ){
157195 /* If we know that only a prefix of the record will be used,
157196 ** it is advantageous to reduce the "column count" field in
157197 ** the P4 operand of the OP_OpenRead/Write opcode. */
157198 Bitmask b = pTabItem->colUsed;
@@ -233818,11 +233819,11 @@
233818 int nArg, /* Number of args */
233819 sqlite3_value **apUnused /* Function arguments */
233820 ){
233821 assert( nArg==0 );
233822 UNUSED_PARAM2(nArg, apUnused);
233823 sqlite3_result_text(pCtx, "fts5: 2022-01-31 14:14:29 539cef5214446a7181614793e9cf323e95ba00ba0f888585b14b598dd2ff0808", -1, SQLITE_TRANSIENT);
233824 }
233825
233826 /*
233827 ** Return true if zName is the extension on one of the shadow tables used
233828 ** by this module.
233829
--- extsrc/sqlite3.c
+++ extsrc/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.38.0"
456 #define SQLITE_VERSION_NUMBER 3038000
457 #define SQLITE_SOURCE_ID "2022-01-31 16:29:06 3ec6141c41a71eea0d96a65aa35c828e4d852d60e090513c312b925d0e257f9a"
458
459 /*
460 ** CAPI3REF: Run-Time Library Version Numbers
461 ** KEYWORDS: sqlite3_version sqlite3_sourceid
462 **
@@ -157189,10 +157189,11 @@
157189 testcase( pWInfo->eOnePass==ONEPASS_OFF && pTab->nCol==BMS-1 );
157190 testcase( pWInfo->eOnePass==ONEPASS_OFF && pTab->nCol==BMS );
157191 if( pWInfo->eOnePass==ONEPASS_OFF
157192 && pTab->nCol<BMS
157193 && (pTab->tabFlags & (TF_HasGenerated|TF_WithoutRowid))==0
157194 && (pLoop->wsFlags & (WHERE_AUTO_INDEX|WHERE_BLOOMFILTER))==0
157195 ){
157196 /* If we know that only a prefix of the record will be used,
157197 ** it is advantageous to reduce the "column count" field in
157198 ** the P4 operand of the OP_OpenRead/Write opcode. */
157199 Bitmask b = pTabItem->colUsed;
@@ -233818,11 +233819,11 @@
233819 int nArg, /* Number of args */
233820 sqlite3_value **apUnused /* Function arguments */
233821 ){
233822 assert( nArg==0 );
233823 UNUSED_PARAM2(nArg, apUnused);
233824 sqlite3_result_text(pCtx, "fts5: 2022-01-31 16:29:06 3ec6141c41a71eea0d96a65aa35c828e4d852d60e090513c312b925d0e257f9a", -1, SQLITE_TRANSIENT);
233825 }
233826
233827 /*
233828 ** Return true if zName is the extension on one of the shadow tables used
233829 ** by this module.
233830
M extsrc/sqlite3.h
+1 -1
--- extsrc/sqlite3.h
+++ extsrc/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.38.0"
150150
 #define SQLITE_VERSION_NUMBER 3038000
151
-#define SQLITE_SOURCE_ID "2022-01-31 14:14:29 539cef5214446a7181614793e9cf323e95ba00ba0f888585b14b598dd2ff0808"
151
+#define SQLITE_SOURCE_ID "2022-01-31 16:29:06 3ec6141c41a71eea0d96a65aa35c828e4d852d60e090513c312b925d0e257f9a"
152152
153153
 /*
154154
 ** CAPI3REF: Run-Time Library Version Numbers
155155
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
156156
 **
157157
--- extsrc/sqlite3.h
+++ extsrc/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.38.0"
150 #define SQLITE_VERSION_NUMBER 3038000
151 #define SQLITE_SOURCE_ID "2022-01-31 14:14:29 539cef5214446a7181614793e9cf323e95ba00ba0f888585b14b598dd2ff0808"
152
153 /*
154 ** CAPI3REF: Run-Time Library Version Numbers
155 ** KEYWORDS: sqlite3_version sqlite3_sourceid
156 **
157
--- extsrc/sqlite3.h
+++ extsrc/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.38.0"
150 #define SQLITE_VERSION_NUMBER 3038000
151 #define SQLITE_SOURCE_ID "2022-01-31 16:29:06 3ec6141c41a71eea0d96a65aa35c828e4d852d60e090513c312b925d0e257f9a"
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