diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/build.c | 12 | ||||
| -rw-r--r-- | src/pragma.c | 4 | ||||
| -rw-r--r-- | src/select.c | 4 | ||||
| -rw-r--r-- | src/tokenize.c | 4 | ||||
| -rw-r--r-- | src/vdbeaux.c | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/build.c b/src/build.c index 3447898ed..937b3264a 100644 --- a/src/build.c +++ b/src/build.c @@ -23,7 +23,7 @@ ** ROLLBACK ** PRAGMA ** -** $Id: build.c,v 1.251 2004/09/06 17:24:12 drh Exp $ +** $Id: build.c,v 1.252 2004/09/08 15:09:41 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -785,7 +785,7 @@ void sqlite3AddColumnType(Parse *pParse, Token *pFirst, Token *pLast){ pCol = &p->aCol[i]; pz = &pCol->zType; n = pLast->n + Addr(pLast->z) - Addr(pFirst->z); - sqlite3SetNString(pz, pFirst->z, n, 0); + sqlite3SetNString(pz, pFirst->z, n, (char*)0); z = *pz; if( z==0 ) return; for(i=j=0; z[i]; i++){ @@ -814,9 +814,9 @@ void sqlite3AddDefaultValue(Parse *pParse, Token *pVal, int minusFlag){ if( i<0 ) return; pz = &p->aCol[i].zDflt; if( minusFlag ){ - sqlite3SetNString(pz, "-", 1, pVal->z, pVal->n, 0); + sqlite3SetNString(pz, "-", 1, pVal->z, pVal->n, (char*)0); }else{ - sqlite3SetNString(pz, pVal->z, pVal->n, 0); + sqlite3SetNString(pz, pVal->z, pVal->n, (char*)0); } sqlite3Dequote(*pz); } @@ -1017,7 +1017,7 @@ static int synthCollSeq(Parse *pParse, CollSeq *pColl){ } if( pParse->nErr==0 ){ sqlite3SetNString(&pParse->zErrMsg, "no such collation sequence: ", - -1, z, n, 0); + -1, z, n, (char*)0); } pParse->nErr++; return SQLITE_ERROR; @@ -1102,7 +1102,7 @@ CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char *zName, int nName){ if( !initbusy && (!pColl || !pColl->xCmp) ){ if( pParse->nErr==0 ){ sqlite3SetNString(&pParse->zErrMsg, "no such collation sequence: ", -1, - zName, nName, 0); + zName, nName, (char*)0); } pParse->nErr++; pColl = 0; diff --git a/src/pragma.c b/src/pragma.c index 1aff7d552..cc5ed3aa2 100644 --- a/src/pragma.c +++ b/src/pragma.c @@ -11,7 +11,7 @@ ************************************************************************* ** This file contains code used to implement the PRAGMA command. ** -** $Id: pragma.c,v 1.64 2004/09/06 17:24:13 drh Exp $ +** $Id: pragma.c,v 1.65 2004/09/08 15:09:41 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -208,7 +208,7 @@ void sqlite3Pragma( if( !zLeft ) return; if( minusFlag ){ zRight = 0; - sqlite3SetNString(&zRight, "-", 1, pValue->z, pValue->n, 0); + sqlite3SetNString(&zRight, "-", 1, pValue->z, pValue->n, (char*)0); }else{ zRight = sqlite3NameFromToken(pValue); } diff --git a/src/select.c b/src/select.c index 65a24871c..c240c2f3b 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.207 2004/09/06 17:24:13 drh Exp $ +** $Id: select.c,v 1.208 2004/09/08 15:09:41 drh Exp $ */ #include "sqliteInt.h" @@ -121,7 +121,7 @@ int sqlite3JoinType(Parse *pParse, Token *pA, Token *pB, Token *pC){ if( pB==0 ){ pB = &dummy; zSp1 = 0; } if( pC==0 ){ pC = &dummy; zSp2 = 0; } sqlite3SetNString(&pParse->zErrMsg, "unknown or unsupported join type: ", 0, - pA->z, pA->n, zSp1, 1, pB->z, pB->n, zSp2, 1, pC->z, pC->n, 0); + pA->z, pA->n, zSp1, 1, pB->z, pB->n, zSp2, 1, pC->z, pC->n, (char*)0); pParse->nErr++; jointype = JT_INNER; }else if( jointype & JT_RIGHT ){ diff --git a/src/tokenize.c b/src/tokenize.c index 7601cf34e..f0865656c 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.86 2004/09/07 16:19:54 drh Exp $ +** $Id: tokenize.c,v 1.87 2004/09/08 15:09:41 drh Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -501,7 +501,7 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){ } case TK_ILLEGAL: { sqlite3SetNString(pzErrMsg, "unrecognized token: \"", -1, - pParse->sLastToken.z, pParse->sLastToken.n, "\"", 1, 0); + pParse->sLastToken.z, pParse->sLastToken.n, "\"", 1, (char*)0); nErr++; goto abort_parse; } diff --git a/src/vdbeaux.c b/src/vdbeaux.c index 5e0b480be..6c91ffefe 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -299,7 +299,7 @@ void sqlite3VdbeChangeP3(Vdbe *p, int addr, const char *zP3, int n){ pOp->p3 = (char*)zP3; pOp->p3type = n; }else{ - sqlite3SetNString(&pOp->p3, zP3, n, 0); + sqlite3SetNString(&pOp->p3, zP3, n, (char*)0); pOp->p3type = P3_DYNAMIC; } } |