diff options
| author | drh <drh@noemail.net> | 2003-12-06 21:43:55 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2003-12-06 21:43:55 +0000 |
| commit | 41743984bf57abf76e04cab439740d4f3f50e710 (patch) | |
| tree | 1732754ca7ccf7812be0db14537f09be25b8694e /src/tokenize.c | |
| parent | 3a6629d27ee0d4d2fb98dcfdab28d1909fc2f672 (diff) | |
| download | sqlite-41743984bf57abf76e04cab439740d4f3f50e710.tar.gz sqlite-41743984bf57abf76e04cab439740d4f3f50e710.zip | |
Always use "(char*)0" to terminate the argument list of sqliteSetString().
This is needed for 64-bit systems that use a 32-bit integer by default. (CVS 1126)
FossilOrigin-Name: 656c90387a4a714b4f31040ece9b0e15e30934af
Diffstat (limited to 'src/tokenize.c')
| -rw-r--r-- | src/tokenize.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/tokenize.c b/src/tokenize.c index d83d3cabf..6bfee3d37 100644 --- a/src/tokenize.c +++ b/src/tokenize.c @@ -15,7 +15,7 @@ ** individual tokens and sends those tokens one-by-one over to the ** parser for analysis. ** -** $Id: tokenize.c,v 1.64 2003/09/27 13:39:39 drh Exp $ +** $Id: tokenize.c,v 1.65 2003/12/06 21:43:56 drh Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -413,7 +413,7 @@ int sqliteRunParser(Parse *pParse, const char *zSql, char **pzErrMsg){ i = 0; pEngine = sqliteParserAlloc((void*(*)(int))malloc); if( pEngine==0 ){ - sqliteSetString(pzErrMsg, "out of memory", 0); + sqliteSetString(pzErrMsg, "out of memory", (char*)0); return 1; } pParse->sLastToken.dyn = 0; @@ -429,7 +429,7 @@ int sqliteRunParser(Parse *pParse, const char *zSql, char **pzErrMsg){ case TK_COMMENT: { if( (db->flags & SQLITE_Interrupt)!=0 ){ pParse->rc = SQLITE_INTERRUPT; - sqliteSetString(pzErrMsg, "interrupt", 0); + sqliteSetString(pzErrMsg, "interrupt", (char*)0); goto abort_parse; } break; @@ -464,7 +464,8 @@ abort_parse: } sqliteParserFree(pEngine, free); if( pParse->rc!=SQLITE_OK && pParse->rc!=SQLITE_DONE && pParse->zErrMsg==0 ){ - sqliteSetString(&pParse->zErrMsg, sqlite_error_string(pParse->rc), 0); + sqliteSetString(&pParse->zErrMsg, sqlite_error_string(pParse->rc), + (char*)0); } if( pParse->zErrMsg ){ if( pzErrMsg && *pzErrMsg==0 ){ |