diff options
author | danielk1977 <danielk1977@noemail.net> | 2005-01-20 13:03:10 +0000 |
---|---|---|
committer | danielk1977 <danielk1977@noemail.net> | 2005-01-20 13:03:10 +0000 |
commit | 5338a5f74de5b7c7309589f59247329a9ebd9ee9 (patch) | |
tree | 6ca35a260616f74ef346a91369a1c4aeca6012f0 /src/expr.c | |
parent | b84f96f8547006589ad75d1e17f9d5a4377a506c (diff) | |
download | sqlite-5338a5f74de5b7c7309589f59247329a9ebd9ee9.tar.gz sqlite-5338a5f74de5b7c7309589f59247329a9ebd9ee9.zip |
Remove a few more lines of code when SQLITE_OMIT_** macros are defined. (CVS 2244)
FossilOrigin-Name: 417bbba93ad7ed5c03d9db6afc12e170155bd152
Diffstat (limited to 'src/expr.c')
-rw-r--r-- | src/expr.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/expr.c b/src/expr.c index 5ef4ffce4..8d9d9f47e 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.183 2005/01/20 01:51:26 drh Exp $ +** $Id: expr.c,v 1.184 2005/01/20 13:03:10 danielk1977 Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -953,11 +953,6 @@ static void getFunctionName(Expr *pExpr, const char **pzName, int *pnName){ *pnName = 17; break; } - default: { - *pzName = "can't happen"; - *pnName = 12; - break; - } } } @@ -1379,12 +1374,14 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ sqlite3VdbeDequoteP3(v, -1); break; } +#ifndef SQLITE_OMIT_BLOB_LITERAL case TK_BLOB: { assert( TK_BLOB==OP_HexBlob ); sqlite3VdbeOp3(v, op, 0, 0, pExpr->token.z+1, pExpr->token.n-1); sqlite3VdbeDequoteP3(v, -1); break; } +#endif case TK_NULL: { sqlite3VdbeAddOp(v, OP_String8, 0, 0); break; @@ -1622,6 +1619,7 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ sqlite3VdbeResolveLabel(v, expr_end_label); break; } +#ifndef SQLITE_OMIT_TRIGGER case TK_RAISE: { if( !pParse->trigStack ){ sqlite3ErrorMsg(pParse, @@ -1642,6 +1640,7 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ VdbeComment((v, "# raise(IGNORE)")); } } +#endif break; } } |