diff options
| author | drh <drh@noemail.net> | 2008-06-27 00:52:45 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2008-06-27 00:52:45 +0000 |
| commit | 6fccc35a9187673f97fed9ddedd06363e4c9b55e (patch) | |
| tree | 85b4e814d2685749ab29818aaec2c4dcc22b78af /src | |
| parent | 66ba23ce86f1dee79b3f3f47e9fb7fd6f6b3dd33 (diff) | |
| download | sqlite-6fccc35a9187673f97fed9ddedd06363e4c9b55e.tar.gz sqlite-6fccc35a9187673f97fed9ddedd06363e4c9b55e.zip | |
Remove unused variable. Fix a compiler warning. (CVS 5319)
FossilOrigin-Name: 0b01ec5cf7725a02d4c12167df125cef578f6219
Diffstat (limited to 'src')
| -rw-r--r-- | src/expr.c | 4 | ||||
| -rw-r--r-- | src/select.c | 6 | ||||
| -rw-r--r-- | src/sqlite3ext.h | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/expr.c b/src/expr.c index 492832fe6..e548d02cf 100644 --- a/src/expr.c +++ b/src/expr.c @@ -12,7 +12,7 @@ ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** -** $Id: expr.c,v 1.380 2008/06/27 00:47:29 drh Exp $ +** $Id: expr.c,v 1.381 2008/06/27 00:52:45 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -2578,7 +2578,7 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){ case TK_IN: { int rNotFound = 0; int rMayHaveNull = 0; - int j1, j2, j3, j4, j5; + int j2, j3, j4, j5; char affinity; int eType; diff --git a/src/select.c b/src/select.c index 7f5be1177..ddd03726c 100644 --- a/src/select.c +++ b/src/select.c @@ -12,7 +12,7 @@ ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. ** -** $Id: select.c,v 1.438 2008/06/27 00:47:29 drh Exp $ +** $Id: select.c,v 1.439 2008/06/27 00:52:45 drh Exp $ */ #include "sqliteInt.h" @@ -652,8 +652,6 @@ static void selectInnerLoop( ** item into the set table with bogus data. */ case SRT_Set: { - int addr2; - assert( nColumn==1 ); p->affinity = sqlite3CompareAffinity(pEList->a[0].pExpr, pDest->affinity); if( pOrderBy ){ @@ -2384,7 +2382,7 @@ static int generateOutputSubroutine( ** item into the set table with bogus data. */ case SRT_Set: { - int addr2, r1; + int r1; assert( pIn->nMem==1 ); p->affinity = sqlite3CompareAffinity(p->pEList->a[0].pExpr, pDest->affinity); diff --git a/src/sqlite3ext.h b/src/sqlite3ext.h index 15e49e684..05e8fac82 100644 --- a/src/sqlite3ext.h +++ b/src/sqlite3ext.h @@ -15,7 +15,7 @@ ** as extensions by SQLite should #include this file instead of ** sqlite3.h. ** -** @(#) $Id: sqlite3ext.h,v 1.22 2008/06/19 15:06:24 drh Exp $ +** @(#) $Id: sqlite3ext.h,v 1.23 2008/06/27 00:52:45 drh Exp $ */ #ifndef _SQLITE3EXT_H_ #define _SQLITE3EXT_H_ @@ -78,7 +78,7 @@ struct sqlite3_api_routines { int (*complete)(const char*sql); int (*complete16)(const void*sql); int (*create_collation)(sqlite3*,const char*,int,void*,int(*)(void*,int,const void*,int,const void*)); - int (*create_collation16)(sqlite3*,const char*,int,void*,int(*)(void*,int,const void*,int,const void*)); + int (*create_collation16)(sqlite3*,const void*,int,void*,int(*)(void*,int,const void*,int,const void*)); int (*create_function)(sqlite3*,const char*,int,int,void*,void (*xFunc)(sqlite3_context*,int,sqlite3_value**),void (*xStep)(sqlite3_context*,int,sqlite3_value**),void (*xFinal)(sqlite3_context*)); int (*create_function16)(sqlite3*,const void*,int,int,void*,void (*xFunc)(sqlite3_context*,int,sqlite3_value**),void (*xStep)(sqlite3_context*,int,sqlite3_value**),void (*xFinal)(sqlite3_context*)); int (*create_module)(sqlite3*,const char*,const sqlite3_module*,void*); |