diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/select.c | 4 | ||||
| -rw-r--r-- | src/shell.c.in | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/select.c b/src/select.c index 336d1503a..192f32c52 100644 --- a/src/select.c +++ b/src/select.c @@ -2331,7 +2331,7 @@ void sqlite3SubqueryColumnTypes( a = pSelect->pEList->a; for(i=0, pCol=pTab->aCol; i<pTab->nCol; i++, pCol++){ const char *zType; - i64 n, m; + i64 n; pTab->tabFlags |= (pCol->colFlags & COLFLAG_NOINSERT); p = a[i].pExpr; /* pCol->szEst = ... // Column size est for SELECT tables never used */ @@ -2370,7 +2370,7 @@ void sqlite3SubqueryColumnTypes( } } if( zType ){ - m = sqlite3Strlen30(zType); + i64 m = sqlite3Strlen30(zType); n = sqlite3Strlen30(pCol->zCnName); pCol->zCnName = sqlite3DbReallocOrFree(db, pCol->zCnName, n+m+2); if( pCol->zCnName ){ diff --git a/src/shell.c.in b/src/shell.c.in index 131a82d2a..f41f2c95d 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -535,7 +535,7 @@ static char *dynamicContinuePrompt(void){ return continuePrompt; }else{ if( dynPrompt.zScannerAwaits ){ - int ncp = strlen(continuePrompt), ndp = strlen(dynPrompt.zScannerAwaits); + size_t ncp = strlen(continuePrompt), ndp = strlen(dynPrompt.zScannerAwaits); if( ndp > ncp-3 ) return continuePrompt; strcpy(dynPrompt.dynamicPrompt, dynPrompt.zScannerAwaits); while( ndp<3 ) dynPrompt.dynamicPrompt[ndp++] = ' '; @@ -10378,10 +10378,10 @@ static int do_meta_command(char *zLine, ShellState *p){ if( SQLITE_ROW==sqlite3_step(pCheckStmt) ){ double countIrreversible = sqlite3_column_double(pCheckStmt, 0); if( countIrreversible>0 ){ - int n = (int)(countIrreversible + 0.5); + int sz = (int)(countIrreversible + 0.5); utf8_printf(stderr, "Digest includes %d invalidly encoded text field%s.\n", - n, (n>1)? "s": ""); + sz, (sz>1)? "s": ""); } } sqlite3_finalize(pCheckStmt); |