database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Clean up annoying (and pointless) compiler warnings about differing signedness. (CVS 2810)

Browse Source 
FossilOrigin-Name: 83a59151559d9496d4f546e03e65087ea974717d
This commit is contained in:
drh
2005-12-09 20:02:05 +00:00
parent 97cb2e969b
commit 2646da7e52
25 changed files with 143 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
manifest
View File

@@ -1,5 +1,5 @@
C Define\sthe\ssqliteMalloc()\smacro\sdifferently\sto\savoid\sa\scompiler\swarning.\s(CVS\s2809) C Clean\sup\sannoying\s(and\spointless)\scompiler\swarnings\sabout\sdiffering\ssignedness.\s(CVS\s2810)
D 2005-12-09T14:39:04 D 2005-12-09T20:02:05
F Makefile.in e3c6b3a38d734d41574c04f2fc90d18de2b87102 F Makefile.in e3c6b3a38d734d41574c04f2fc90d18de2b87102
F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -30,46 +30,46 @@ F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
F sqlite3.def c413e514217736884254739a105c8c942fdf0c2f F sqlite3.def c413e514217736884254739a105c8c942fdf0c2f
F sqlite3.pc.in 985b9bf34192a549d7d370e0f0b6b34a4f61369a F sqlite3.pc.in 985b9bf34192a549d7d370e0f0b6b34a4f61369a
F src/alter.c 7ed4b794c2e3a8ad8c1effe50202eaef42cedc23 F src/alter.c 26e590618fe6a316c74626dbea6529c7315172e9
F src/analyze.c ea42005eed52c382fcc7ef66969e7f1858597633 F src/analyze.c ea42005eed52c382fcc7ef66969e7f1858597633
F src/attach.c ee70131f128d31a9c6dcb8824e8471c91b18601a F src/attach.c ee70131f128d31a9c6dcb8824e8471c91b18601a
F src/auth.c 31e2304bef67f44d635655f44234387ea7d21454 F src/auth.c 31e2304bef67f44d635655f44234387ea7d21454
F src/btree.c aa88194f460becf8fff6196996d6e38f1b37286e F src/btree.c de0fc1a0f6a4631001ffb6070d1b7588cdebcbc5
F src/btree.h 1ed561263ca0e335bc3e81d761c9d5ff8c22f61e F src/btree.h 1ed561263ca0e335bc3e81d761c9d5ff8c22f61e
F src/build.c 41350367dc5837b0dafa83cbd5bf08f0108031b0 F src/build.c 306dde3134acd8f1c9f3821d81c3cb598af91280
F src/callback.c 4bc404e9912eecb28be1235581833f6269920c27 F src/callback.c 4bc404e9912eecb28be1235581833f6269920c27
F src/complete.c 4de937dfdd4c79a501772ab2035b26082f337a79 F src/complete.c 4de937dfdd4c79a501772ab2035b26082f337a79
F src/date.c 8bc8d084a17d19c44d9cbf357b5f656db6706ce1 F src/date.c bb079317bff6a2b78aba5c0d2ddae5f6f03acfb7
F src/delete.c 6010a081edda9871895260def092e852f0bb60a0 F src/delete.c 6010a081edda9871895260def092e852f0bb60a0
F src/experimental.c 50c1e3b34f752f4ac10c36f287db095c2b61766d F src/experimental.c 50c1e3b34f752f4ac10c36f287db095c2b61766d
F src/expr.c 540ed7eb44b79e5603c3656466bf1d7381abcfc7 F src/expr.c abdd20121595e37cc2db3612f3c0e6f5db1a9652
F src/func.c f5171a1bd0bc3eae91d37bd42724784570b203cd F src/func.c 25f1e5710b71cb345b492a18088f546188599f6b
F src/hash.c 8747cf51d12de46512880dfcf1b68b4e24072863 F src/hash.c 8747cf51d12de46512880dfcf1b68b4e24072863
F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84 F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84
F src/insert.c 5393479164f317ea0aeec954c6500cafa097ef33 F src/insert.c 5393479164f317ea0aeec954c6500cafa097ef33
F src/legacy.c 7b88d20efc8e6c208f262d97aee9c8e2cf02bc91 F src/legacy.c 7b88d20efc8e6c208f262d97aee9c8e2cf02bc91
F src/main.c 8da1f263376c33c5d5911a6de789e30a596381d3 F src/main.c d8656320f9299c70ee6a41deab5350d615ffa3b7
F src/md5.c 7ae1c39044b95de2f62e066f47bb1deb880a1070 F src/md5.c 7ae1c39044b95de2f62e066f47bb1deb880a1070
F src/os.c bdd3a2fd089777e7ad18b57c896f1141d5a0c1fd F src/os.c bdd3a2fd089777e7ad18b57c896f1141d5a0c1fd
F src/os.h d5ae3f4c1c7731437b6cddec279b7c06f761c44e F src/os.h d5ae3f4c1c7731437b6cddec279b7c06f761c44e
F src/os_common.h d74a11728ad2444b6b695b94c28c06881f049e49 F src/os_common.h d74a11728ad2444b6b695b94c28c06881f049e49
F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
F src/os_unix.c 01648f7fa16cddb1f8a11ef2a582348801b185a6 F src/os_unix.c f11eba69eea2ae2723f5ae1bdad8b1ef12e224b9
F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
F src/os_win.c d962ac2dd0e482847e42b846d46cd044f97d1c32 F src/os_win.c d962ac2dd0e482847e42b846d46cd044f97d1c32
F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
F src/pager.c 893cb2106261a4f77d84c1fa0d10a083e889b23b F src/pager.c 49f63a54b57164a70df0b1539141003fd27856c6
F src/pager.h e7b41ce8e7b5f629d456708b7ad9a8c8ede37140 F src/pager.h e7b41ce8e7b5f629d456708b7ad9a8c8ede37140
F src/parse.y 87080d89439925de19f16189310d3dbc7f9ab3f6 F src/parse.y d0b1f9a4d508bf043cdbc7079aa26dff7d358651
F src/pragma.c a6d3a7c76b4008b8197913de4bd2079e00b145db F src/pragma.c 8883b4d34796efa315bdd0ec1b03f580ef1575b9
F src/prepare.c 7e21ab5e2304e76f5f679d0df19dca3b0e3ff4f2 F src/prepare.c 8d75f7dbe7b1055789be17d6a70f1fedcaf4c31d
F src/printf.c 3ea3a17d25d7ac498efc18007c70371a42c968f8 F src/printf.c f47a2f4b5387cd2ebb12e9117a1a5d6bd9a2b812
F src/random.c ff5e9a8cad790e2a51cd4d2e7737dc8540e09d1d F src/random.c ff5e9a8cad790e2a51cd4d2e7737dc8540e09d1d
F src/select.c 0e4d3627fec4a445b45f6cb471f68aab9c97a8b3 F src/select.c 2292b065bc6be61e01aad39a2e1b93e332fb7e57
F src/shell.c 4872acee1d2a826c73c914961e469e563204b7f9 F src/shell.c 4872acee1d2a826c73c914961e469e563204b7f9
F src/sqlite.h.in 8e648e1f386e4509f2f96c09ded7c07b0df0c9a2 F src/sqlite.h.in 8e648e1f386e4509f2f96c09ded7c07b0df0c9a2
F src/sqliteInt.h f74a403b6110aa973fd6892d894c9ca5b94ab23a F src/sqliteInt.h feb11bfe9bf79b4493319173c47739fe2bb7ffa4
F src/table.c 486dcfce532685b53b5a2b5da8bba0ded6fb2316 F src/table.c 486dcfce532685b53b5a2b5da8bba0ded6fb2316
F src/tclsqlite.c 328060916c24d328cfab1622c9a0e7ad57c2da8c F src/tclsqlite.c 328060916c24d328cfab1622c9a0e7ad57c2da8c
F src/test1.c 96d78c83c011df65f1c3538e2118647b09239acd F src/test1.c 96d78c83c011df65f1c3538e2118647b09239acd
@@ -78,19 +78,19 @@ F src/test3.c f4e6a16a602091696619a1171bda25c0e3df49f7
F src/test4.c a8fd681e139e1c61f22a77d07fc3a99cb28fff3f F src/test4.c a8fd681e139e1c61f22a77d07fc3a99cb28fff3f
F src/test5.c 64f08b2a50ef371a1bd68ff206829e7b1b9997f5 F src/test5.c 64f08b2a50ef371a1bd68ff206829e7b1b9997f5
F src/test6.c cb811391ec0b7c75f29e545d4820a9cf19f3637e F src/test6.c cb811391ec0b7c75f29e545d4820a9cf19f3637e
F src/tokenize.c a189d7466524076220f41a21baed05e1639a82f4 F src/tokenize.c 7a3a3d3cc734f684a77c4dfd09eb46fcee25394c
F src/trigger.c dfc1f8ee8e71c6482fb269695778c8b51f821c98 F src/trigger.c 2925ba96d964d9b717e74006bf7e64b8a6b70d97
F src/update.c ec8e540617b116725b5a55c8d6b4db8bc67fdd7d F src/update.c ec8e540617b116725b5a55c8d6b4db8bc67fdd7d
F src/utf.c bda5eb85039ef16f2d17004c1e18c96e1ab0a80c F src/utf.c a1fd34e5db0dc4da1c37405381a656230c7b922d
F src/util.c 94c0b99e66243b3452c81cd321eb6e61e4c5fba0 F src/util.c 94c0b99e66243b3452c81cd321eb6e61e4c5fba0
F src/vacuum.c 3cd457f91b05338269f2ea21c4c58dce93f2eef2 F src/vacuum.c fbfdd3967fd34e2f260fafed88dcbf3c10856b94
F src/vdbe.c 4f78f1fe3b5e7675ee54a2cc18f14dea4ff5fd94 F src/vdbe.c d09c185f4badac6c79f2a919cbf661e7b5618293
F src/vdbe.h 8729a4ee16ff9aeab2af9667df3cf300ff978e13 F src/vdbe.h 8729a4ee16ff9aeab2af9667df3cf300ff978e13
F src/vdbeInt.h 0055c37eccbf3a189fd893a90f8eb6a5fa60c871 F src/vdbeInt.h 0055c37eccbf3a189fd893a90f8eb6a5fa60c871
F src/vdbeapi.c b270b680cbc5d20b5a1abfdb08339667985df94e F src/vdbeapi.c b270b680cbc5d20b5a1abfdb08339667985df94e
F src/vdbeaux.c b0a4a4b19b42f18d86c0026a9cc548478dc6a7a7 F src/vdbeaux.c f714ee9e91f1e47d4b6ae83798e0b263ffe224cc
F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
F src/vdbemem.c 1c70555d615c6001c4490dedb6a62cb2884b92ff F src/vdbemem.c deba8d6e3727643924b210a8c531a496c2b8d386
F src/where.c 269569f380ddc018518f67765fe2f0d3c8760e28 F src/where.c 269569f380ddc018518f67765fe2f0d3c8760e28
F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
F test/all.test 7f0988442ab811dfa41793b5b550f5828ce316f3 F test/all.test 7f0988442ab811dfa41793b5b550f5828ce316f3
@@ -264,7 +264,7 @@ F tool/lempar.c 424df14a48736bb961ed47acf30c26d66ed85a62
F tool/memleak.awk 4e7690a51bf3ed757e611273d43fe3f65b510133 F tool/memleak.awk 4e7690a51bf3ed757e611273d43fe3f65b510133
F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8 F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
F tool/memleak3.tcl 7707006ee908cffff210c98158788d85bb3fcdbf F tool/memleak3.tcl 7707006ee908cffff210c98158788d85bb3fcdbf
F tool/mkkeywordhash.c 5263a654e5c9fd8d6e3238fb39c2d5c3126be32f F tool/mkkeywordhash.c 784791334097c4d6408067633a803819425b0e5e
F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
F tool/report1.txt 9eae07f26a8fc53889b45fc833a66a33daa22816 F tool/report1.txt 9eae07f26a8fc53889b45fc833a66a33daa22816
@@ -327,7 +327,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
P 601c335463aaabc2e9918e4b9298cff6161be5c4 P 3d177bde71811391f79f4ab3bae054ef1bceb6a0
R 6a5215138c99b7ed11b03e5b976ead6d R 28591b123245fca85b0cbb70cd4862f2
U danielk1977 U drh
Z 67f8e397461027dcb38f9fe0ac81e736 Z 483e3117155553497a07bea2c3be4e78

2
manifest.uuid
View File

@@ -1 +1 @@
3d177bde71811391f79f4ab3bae054ef1bceb6a0 83a59151559d9496d4f546e03e65087ea974717d

8
src/alter.c
View File

@@ -12,7 +12,7 @@
** This file contains C code routines that used to generate VDBE code ** This file contains C code routines that used to generate VDBE code
** that implements the ALTER TABLE command. ** that implements the ALTER TABLE command.
** **
** $Id: alter.c,v 1.10 2005/12/06 12:52:59 danielk1977 Exp $ ** $Id: alter.c,v 1.11 2005/12/09 20:02:05 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include <ctype.h> #include <ctype.h>
@@ -47,7 +47,7 @@ static void renameTableFunc(
int token; int token;
Token tname; Token tname;
char const *zCsr = zSql; unsigned char const *zCsr = zSql;
int len = 0; int len = 0;
char *zRet; char *zRet;
@@ -96,7 +96,7 @@ static void renameTriggerFunc(
int token; int token;
Token tname; Token tname;
int dist = 3; int dist = 3;
char const *zCsr = zSql; unsigned char const *zCsr = zSql;
int len = 0; int len = 0;
char *zRet; char *zRet;
@@ -442,7 +442,7 @@ void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
} }
/* Modify the CREATE TABLE statement. */ /* Modify the CREATE TABLE statement. */
zCol = sqliteStrNDup(pColDef->z, pColDef->n); zCol = sqliteStrNDup((char*)pColDef->z, pColDef->n);
if( zCol ){ if( zCol ){
char *zEnd = &zCol[pColDef->n-1]; char *zEnd = &zCol[pColDef->n-1];
while( (zEnd>zCol && *zEnd==';') || isspace(*(unsigned char *)zEnd) ){ while( (zEnd>zCol && *zEnd==';') || isspace(*(unsigned char *)zEnd) ){

4
src/btree.c
View File

@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give. ** May you share freely, never taking more than you give.
** **
************************************************************************* *************************************************************************
** $Id: btree.c,v 1.272 2005/11/24 14:34:36 drh Exp $ ** $Id: btree.c,v 1.273 2005/12/09 20:02:05 drh Exp $
** **
** This file implements a external (disk-based) database using BTrees. ** This file implements a external (disk-based) database using BTrees.
** For a detailed discussion of BTrees, refer to ** For a detailed discussion of BTrees, refer to
@@ -1535,7 +1535,7 @@ static void unlockBtreeIfUnused(Btree *pBt){
if( pBt->inTrans==TRANS_NONE && pBt->pCursor==0 && pBt->pPage1!=0 ){ if( pBt->inTrans==TRANS_NONE && pBt->pCursor==0 && pBt->pPage1!=0 ){
if( pBt->pPage1->aData==0 ){ if( pBt->pPage1->aData==0 ){
MemPage *pPage = pBt->pPage1; MemPage *pPage = pBt->pPage1;
pPage->aData = &((char*)pPage)[-pBt->pageSize]; pPage->aData = &((u8*)pPage)[-pBt->pageSize];
pPage->pBt = pBt; pPage->pBt = pBt;
pPage->pgno = 1; pPage->pgno = 1;
} }

10
src/build.c
View File

@@ -22,7 +22,7 @@
** COMMIT ** COMMIT
** ROLLBACK ** ROLLBACK
** **
** $Id: build.c,v 1.356 2005/12/06 12:52:59 danielk1977 Exp $ ** $Id: build.c,v 1.357 2005/12/09 20:02:05 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include <ctype.h> #include <ctype.h>
@@ -509,7 +509,7 @@ void sqlite3UnlinkAndDeleteTable(sqlite3 *db, int iDb, const char *zTabName){
char *sqlite3NameFromToken(Token *pName){ char *sqlite3NameFromToken(Token *pName){
char *zName; char *zName;
if( pName ){ if( pName ){
zName = sqliteStrNDup(pName->z, pName->n); zName = sqliteStrNDup((char*)pName->z, pName->n);
sqlite3Dequote(zName); sqlite3Dequote(zName);
}else{ }else{
zName = 0; zName = 0;
@@ -2224,8 +2224,8 @@ void sqlite3CreateIndex(
** So create a fake list to simulate this. ** So create a fake list to simulate this.
*/ */
if( pList==0 ){ if( pList==0 ){
nullId.z = pTab->aCol[pTab->nCol-1].zName; nullId.z = (u8*)pTab->aCol[pTab->nCol-1].zName;
nullId.n = strlen(nullId.z); nullId.n = strlen((char*)nullId.z);
pList = sqlite3ExprListAppend(0, 0, &nullId); pList = sqlite3ExprListAppend(0, 0, &nullId);
if( pList==0 ) goto exit_create_index; if( pList==0 ) goto exit_create_index;
} }
@@ -2980,7 +2980,7 @@ void sqlite3Reindex(Parse *pParse, Token *pName1, Token *pName2){
reindexDatabases(pParse, 0); reindexDatabases(pParse, 0);
return; return;
}else if( pName2==0 || pName2->z==0 ){ }else if( pName2==0 || pName2->z==0 ){
pColl = sqlite3FindCollSeq(db, db->enc, pName1->z, pName1->n, 0); pColl = sqlite3FindCollSeq(db, db->enc, (char*)pName1->z, pName1->n, 0);
if( pColl ){ if( pColl ){
reindexDatabases(pParse, pColl); reindexDatabases(pParse, pColl);
return; return;

8
src/date.c
View File

@@ -16,7 +16,7 @@
** sqlite3RegisterDateTimeFunctions() found at the bottom of the file. ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
** All other code has file scope. ** All other code has file scope.
** **
** $Id: date.c,v 1.46 2005/11/30 03:20:31 drh Exp $ ** $Id: date.c,v 1.47 2005/12/09 20:02:05 drh Exp $
** **
** NOTES: ** NOTES:
** **
@@ -639,10 +639,10 @@ static int isDate(int argc, sqlite3_value **argv, DateTime *p){
int i; int i;
if( argc==0 ) return 1; if( argc==0 ) return 1;
if( SQLITE_NULL==sqlite3_value_type(argv[0]) || if( SQLITE_NULL==sqlite3_value_type(argv[0]) ||
parseDateOrTime(sqlite3_value_text(argv[0]), p) ) return 1; parseDateOrTime((char*)sqlite3_value_text(argv[0]), p) ) return 1;
for(i=1; i<argc; i++){ for(i=1; i<argc; i++){
if( SQLITE_NULL==sqlite3_value_type(argv[i]) || if( SQLITE_NULL==sqlite3_value_type(argv[i]) ||
parseModifier(sqlite3_value_text(argv[i]), p) ) return 1; parseModifier((char*)sqlite3_value_text(argv[i]), p) ) return 1;
} }
return 0; return 0;
} }
@@ -755,7 +755,7 @@ static void strftimeFunc(
DateTime x; DateTime x;
int n, i, j; int n, i, j;
char *z; char *z;
const char *zFmt = sqlite3_value_text(argv[0]); const char *zFmt = (const char*)sqlite3_value_text(argv[0]);
char zBuf[100]; char zBuf[100];
if( zFmt==0 || isDate(argc-1, argv+1, &x) ) return; if( zFmt==0 || isDate(argc-1, argv+1, &x) ) return;
for(i=0, n=1; zFmt[i]; i++, n++){ for(i=0, n=1; zFmt[i]; i++, n++){

34
src/expr.c
View File

@@ -12,7 +12,7 @@
** This file contains routines used for analyzing expressions and ** This file contains routines used for analyzing expressions and
** for generating VDBE code that evaluates expressions in SQLite. ** for generating VDBE code that evaluates expressions in SQLite.
** **
** $Id: expr.c,v 1.241 2005/12/06 12:52:59 danielk1977 Exp $ ** $Id: expr.c,v 1.242 2005/12/09 20:02:05 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include <ctype.h> #include <ctype.h>
@@ -235,7 +235,7 @@ Expr *sqlite3RegisterExpr(Parse *pParse, Token *pToken){
if( p==0 ){ if( p==0 ){
return 0; /* Malloc failed */ return 0; /* Malloc failed */
} }
depth = atoi(&pToken->z[1]); depth = atoi((char*)&pToken->z[1]);
p->iTable = pParse->nMem++; p->iTable = pParse->nMem++;
sqlite3VdbeAddOp(v, OP_Dup, depth, 0); sqlite3VdbeAddOp(v, OP_Dup, depth, 0);
sqlite3VdbeAddOp(v, OP_MemStore, p->iTable, 1); sqlite3VdbeAddOp(v, OP_MemStore, p->iTable, 1);
@@ -327,7 +327,7 @@ void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){
/* Wildcard of the form "?nnn". Convert "nnn" to an integer and /* Wildcard of the form "?nnn". Convert "nnn" to an integer and
** use it as the variable number */ ** use it as the variable number */
int i; int i;
pExpr->iTable = i = atoi(&pToken->z[1]); pExpr->iTable = i = atoi((char*)&pToken->z[1]);
if( i<1 || i>SQLITE_MAX_VARIABLE_NUMBER ){ if( i<1 || i>SQLITE_MAX_VARIABLE_NUMBER ){
sqlite3ErrorMsg(pParse, "variable number must be between ?1 and ?%d", sqlite3ErrorMsg(pParse, "variable number must be between ?1 and ?%d",
SQLITE_MAX_VARIABLE_NUMBER); SQLITE_MAX_VARIABLE_NUMBER);
@@ -415,7 +415,7 @@ Expr *sqlite3ExprDup(Expr *p){
if( pNew==0 ) return 0; if( pNew==0 ) return 0;
memcpy(pNew, p, sizeof(*pNew)); memcpy(pNew, p, sizeof(*pNew));
if( p->token.z!=0 ){ if( p->token.z!=0 ){
pNew->token.z = sqliteStrNDup(p->token.z, p->token.n); pNew->token.z = (u8*)sqliteStrNDup((char*)p->token.z, p->token.n);
pNew->token.dyn = 1; pNew->token.dyn = 1;
}else{ }else{
assert( pNew->token.z==0 ); assert( pNew->token.z==0 );
@@ -432,7 +432,7 @@ void sqlite3TokenCopy(Token *pTo, Token *pFrom){
if( pTo->dyn ) sqliteFree((char*)pTo->z); if( pTo->dyn ) sqliteFree((char*)pTo->z);
if( pFrom->z ){ if( pFrom->z ){
pTo->n = pFrom->n; pTo->n = pFrom->n;
pTo->z = sqliteStrNDup(pFrom->z, pFrom->n); pTo->z = (u8*)sqliteStrNDup((char*)pFrom->z, pFrom->n);
pTo->dyn = 1; pTo->dyn = 1;
}else{ }else{
pTo->z = 0; pTo->z = 0;
@@ -752,7 +752,7 @@ int sqlite3ExprIsConstantOrFunction(Expr *p){
int sqlite3ExprIsInteger(Expr *p, int *pValue){ int sqlite3ExprIsInteger(Expr *p, int *pValue){
switch( p->op ){ switch( p->op ){
case TK_INTEGER: { case TK_INTEGER: {
if( sqlite3GetInt32(p->token.z, pValue) ){ if( sqlite3GetInt32((char*)p->token.z, pValue) ){
return 1; return 1;
} }
break; break;
@@ -1150,7 +1150,7 @@ static int nameResolverStep(void *pArg, Expr *pExpr){
FuncDef *pDef; /* Information about the function */ FuncDef *pDef; /* Information about the function */
int enc = pParse->db->enc; /* The database encoding */ int enc = pParse->db->enc; /* The database encoding */
zId = pExpr->token.z; zId = (char*)pExpr->token.z;
nId = pExpr->token.n; nId = pExpr->token.n;
pDef = sqlite3FindFunction(pParse->db, zId, nId, n, enc, 0); pDef = sqlite3FindFunction(pParse->db, zId, nId, n, enc, 0);
if( pDef==0 ){ if( pDef==0 ){
@@ -1402,7 +1402,7 @@ void sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){
** value of this select in a memory cell and record the number ** value of this select in a memory cell and record the number
** of the memory cell in iColumn. ** of the memory cell in iColumn.
*/ */
static const Token one = { "1", 0, 1 }; static const Token one = { (u8*)"1", 0, 1 };
Select *pSel; Select *pSel;
int iMem; int iMem;
int sop; int sop;
@@ -1503,7 +1503,7 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){
break; break;
} }
case TK_INTEGER: { case TK_INTEGER: {
codeInteger(v, pExpr->token.z, pExpr->token.n); codeInteger(v, (char*)pExpr->token.z, pExpr->token.n);
break; break;
} }
case TK_FLOAT: case TK_FLOAT:
@@ -1511,7 +1511,7 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){
assert( TK_FLOAT==OP_Real ); assert( TK_FLOAT==OP_Real );
assert( TK_STRING==OP_String8 ); assert( TK_STRING==OP_String8 );
sqlite3DequoteExpr(pExpr); sqlite3DequoteExpr(pExpr);
sqlite3VdbeOp3(v, op, 0, 0, pExpr->token.z, pExpr->token.n); sqlite3VdbeOp3(v, op, 0, 0, (char*)pExpr->token.z, pExpr->token.n);
break; break;
} }
case TK_NULL: { case TK_NULL: {
@@ -1524,7 +1524,7 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){
const char *z; const char *z;
assert( TK_BLOB==OP_HexBlob ); assert( TK_BLOB==OP_HexBlob );
n = pExpr->token.n - 3; n = pExpr->token.n - 3;
z = pExpr->token.z + 2; z = (char*)pExpr->token.z + 2;
assert( n>=0 ); assert( n>=0 );
if( n==0 ){ if( n==0 ){
z = ""; z = "";
@@ -1536,7 +1536,7 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){
case TK_VARIABLE: { case TK_VARIABLE: {
sqlite3VdbeAddOp(v, OP_Variable, pExpr->iTable, 0); sqlite3VdbeAddOp(v, OP_Variable, pExpr->iTable, 0);
if( pExpr->token.n>1 ){ if( pExpr->token.n>1 ){
sqlite3VdbeChangeP3(v, -1, pExpr->token.z, pExpr->token.n); sqlite3VdbeChangeP3(v, -1, (char*)pExpr->token.z, pExpr->token.n);
} }
break; break;
} }
@@ -1667,7 +1667,7 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){
int i; int i;
u8 enc = pParse->db->enc; u8 enc = pParse->db->enc;
CollSeq *pColl = 0; CollSeq *pColl = 0;
zId = pExpr->token.z; zId = (char*)pExpr->token.z;
nId = pExpr->token.n; nId = pExpr->token.n;
pDef = sqlite3FindFunction(pParse->db, zId, nId, nExpr, enc, 0); pDef = sqlite3FindFunction(pParse->db, zId, nId, nExpr, enc, 0);
assert( pDef!=0 ); assert( pDef!=0 );
@@ -1803,7 +1803,7 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){
pExpr->iColumn == OE_Fail ); pExpr->iColumn == OE_Fail );
sqlite3DequoteExpr(pExpr); sqlite3DequoteExpr(pExpr);
sqlite3VdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, pExpr->iColumn, sqlite3VdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, pExpr->iColumn,
pExpr->token.z, pExpr->token.n); (char*)pExpr->token.z, pExpr->token.n);
} else { } else {
assert( pExpr->iColumn == OE_Ignore ); assert( pExpr->iColumn == OE_Ignore );
sqlite3VdbeAddOp(v, OP_ContextPop, 0, 0); sqlite3VdbeAddOp(v, OP_ContextPop, 0, 0);
@@ -2106,7 +2106,9 @@ int sqlite3ExprCompare(Expr *pA, Expr *pB){
if( pA->token.z ){ if( pA->token.z ){
if( pB->token.z==0 ) return 0; if( pB->token.z==0 ) return 0;
if( pB->token.n!=pA->token.n ) return 0; if( pB->token.n!=pA->token.n ) return 0;
if( sqlite3StrNICmp(pA->token.z, pB->token.z, pB->token.n)!=0 ) return 0; if( sqlite3StrNICmp((char*)pA->token.z,(char*)pB->token.z,pB->token.n)!=0 ){
return 0;
}
} }
return 1; return 1;
} }
@@ -2237,7 +2239,7 @@ static int analyzeAggregate(void *pArg, Expr *pExpr){
pItem->pExpr = pExpr; pItem->pExpr = pExpr;
pItem->iMem = pParse->nMem++; pItem->iMem = pParse->nMem++;
pItem->pFunc = sqlite3FindFunction(pParse->db, pItem->pFunc = sqlite3FindFunction(pParse->db,
pExpr->token.z, pExpr->token.n, (char*)pExpr->token.z, pExpr->token.n,
pExpr->pList ? pExpr->pList->nExpr : 0, enc, 0); pExpr->pList ? pExpr->pList->nExpr : 0, enc, 0);
if( pExpr->flags & EP_Distinct ){ if( pExpr->flags & EP_Distinct ){
pItem->iDistinct = pParse->nTab++; pItem->iDistinct = pParse->nTab++;

30
src/func.c
View File

@@ -16,7 +16,7 @@
** sqliteRegisterBuildinFunctions() found at the bottom of the file. ** sqliteRegisterBuildinFunctions() found at the bottom of the file.
** All other code has file scope. ** All other code has file scope.
** **
** $Id: func.c,v 1.112 2005/12/06 17:19:11 danielk1977 Exp $ ** $Id: func.c,v 1.113 2005/12/09 20:02:05 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include <ctype.h> #include <ctype.h>
@@ -101,7 +101,7 @@ static void lengthFunc(
break; break;
} }
case SQLITE_TEXT: { case SQLITE_TEXT: {
const char *z = sqlite3_value_text(argv[0]); const unsigned char *z = sqlite3_value_text(argv[0]);
for(len=0; *z; z++){ if( (0xc0&*z)!=0x80 ) len++; } for(len=0; *z; z++){ if( (0xc0&*z)!=0x80 ) len++; }
sqlite3_result_int(context, len); sqlite3_result_int(context, len);
break; break;
@@ -146,8 +146,8 @@ static void substrFunc(
int argc, int argc,
sqlite3_value **argv sqlite3_value **argv
){ ){
const char *z; const unsigned char *z;
const char *z2; const unsigned char *z2;
int i; int i;
int p1, p2, len; int p1, p2, len;
@@ -178,7 +178,7 @@ static void substrFunc(
} }
while( z[i] && (z[i]&0xc0)==0x80 ){ i++; p2++; } while( z[i] && (z[i]&0xc0)==0x80 ){ i++; p2++; }
if( p2<0 ) p2 = 0; if( p2<0 ) p2 = 0;
sqlite3_result_text(context, &z[p1], p2, SQLITE_TRANSIENT); sqlite3_result_text(context, (char*)&z[p1], p2, SQLITE_TRANSIENT);
} }
/* /*
@@ -210,11 +210,11 @@ static void upperFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return; if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return;
z = sqliteMalloc(sqlite3_value_bytes(argv[0])+1); z = sqliteMalloc(sqlite3_value_bytes(argv[0])+1);
if( z==0 ) return; if( z==0 ) return;
strcpy(z, sqlite3_value_text(argv[0])); strcpy((char*)z, (char*)sqlite3_value_text(argv[0]));
for(i=0; z[i]; i++){ for(i=0; z[i]; i++){
z[i] = toupper(z[i]); z[i] = toupper(z[i]);
} }
sqlite3_result_text(context, z, -1, SQLITE_TRANSIENT); sqlite3_result_text(context, (char*)z, -1, SQLITE_TRANSIENT);
sqliteFree(z); sqliteFree(z);
} }
static void lowerFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ static void lowerFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
@@ -223,11 +223,11 @@ static void lowerFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return; if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return;
z = sqliteMalloc(sqlite3_value_bytes(argv[0])+1); z = sqliteMalloc(sqlite3_value_bytes(argv[0])+1);
if( z==0 ) return; if( z==0 ) return;
strcpy(z, sqlite3_value_text(argv[0])); strcpy((char*)z, (char*)sqlite3_value_text(argv[0]));
for(i=0; z[i]; i++){ for(i=0; z[i]; i++){
z[i] = tolower(z[i]); z[i] = tolower(z[i]);
} }
sqlite3_result_text(context, z, -1, SQLITE_TRANSIENT); sqlite3_result_text(context, (char*)z, -1, SQLITE_TRANSIENT);
sqliteFree(z); sqliteFree(z);
} }
@@ -495,7 +495,7 @@ static void likeFunc(
** Otherwise, return an error. ** Otherwise, return an error.
*/ */
const unsigned char *zEsc = sqlite3_value_text(argv[2]); const unsigned char *zEsc = sqlite3_value_text(argv[2]);
if( sqlite3utf8CharLen(zEsc, -1)!=1 ){ if( sqlite3utf8CharLen((char*)zEsc, -1)!=1 ){
sqlite3_result_error(context, sqlite3_result_error(context,
"ESCAPE expression must be a single character", -1); "ESCAPE expression must be a single character", -1);
return; return;
@@ -592,7 +592,7 @@ static void quoteFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
} }
case SQLITE_TEXT: { case SQLITE_TEXT: {
int i,j,n; int i,j,n;
const char *zArg = sqlite3_value_text(argv[0]); const unsigned char *zArg = sqlite3_value_text(argv[0]);
char *z; char *z;
for(i=n=0; zArg[i]; i++){ if( zArg[i]=='\'' ) n++; } for(i=n=0; zArg[i]; i++){ if( zArg[i]=='\'' ) n++; }
@@ -692,7 +692,7 @@ static void randStr(sqlite3_context *context, int argc, sqlite3_value **argv){
zBuf[i] = zSrc[zBuf[i]%(sizeof(zSrc)-1)]; zBuf[i] = zSrc[zBuf[i]%(sizeof(zSrc)-1)];
} }
zBuf[n] = 0; zBuf[n] = 0;
sqlite3_result_text(context, zBuf, n, SQLITE_TRANSIENT); sqlite3_result_text(context, (char*)zBuf, n, SQLITE_TRANSIENT);
} }
#endif /* SQLITE_TEST */ #endif /* SQLITE_TEST */
@@ -776,7 +776,7 @@ static void test_auxdata(
char *zRet = sqliteMalloc(nArg*2); char *zRet = sqliteMalloc(nArg*2);
if( !zRet ) return; if( !zRet ) return;
for(i=0; i<nArg; i++){ for(i=0; i<nArg; i++){
char const *z = sqlite3_value_text(argv[i]); char const *z = (char*)sqlite3_value_text(argv[i]);
if( z ){ if( z ){
char *zAux = sqlite3_get_auxdata(pCtx, i); char *zAux = sqlite3_get_auxdata(pCtx, i);
if( zAux ){ if( zAux ){
@@ -807,7 +807,7 @@ static void test_error(
int nArg, int nArg,
sqlite3_value **argv sqlite3_value **argv
){ ){
sqlite3_result_error(pCtx, sqlite3_value_text(argv[0]), 0); sqlite3_result_error(pCtx, (char*)sqlite3_value_text(argv[0]), 0);
} }
#endif /* SQLITE_TEST */ #endif /* SQLITE_TEST */
@@ -1100,7 +1100,7 @@ int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocase, char *aWc){
if( pExpr->pList->nExpr!=2 ){ if( pExpr->pList->nExpr!=2 ){
return 0; return 0;
} }
pDef = sqlite3FindFunction(db, pExpr->token.z, pExpr->token.n, 2, pDef = sqlite3FindFunction(db, (char*)pExpr->token.z, pExpr->token.n, 2,
SQLITE_UTF8, 0); SQLITE_UTF8, 0);
if( pDef==0 || (pDef->flags & SQLITE_FUNC_LIKE)==0 ){ if( pDef==0 || (pDef->flags & SQLITE_FUNC_LIKE)==0 ){
return 0; return 0;

4
src/main.c
View File

@@ -14,7 +14,7 @@
** other files are for internal use by SQLite and should not be ** other files are for internal use by SQLite and should not be
** accessed by users of the library. ** accessed by users of the library.
** **
** $Id: main.c,v 1.306 2005/12/06 13:19:08 drh Exp $ ** $Id: main.c,v 1.307 2005/12/09 20:02:05 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include "os.h" #include "os.h"
@@ -641,7 +641,7 @@ const char *sqlite3_errmsg(sqlite3 *db){
if( sqlite3SafetyCheck(db) || db->errCode==SQLITE_MISUSE ){ if( sqlite3SafetyCheck(db) || db->errCode==SQLITE_MISUSE ){
return sqlite3ErrStr(SQLITE_MISUSE); return sqlite3ErrStr(SQLITE_MISUSE);
} }
z = sqlite3_value_text(db->pErr); z = (char*)sqlite3_value_text(db->pErr);
if( z==0 ){ if( z==0 ){
z = sqlite3ErrStr(db->errCode); z = sqlite3ErrStr(db->errCode);
} }

1
src/os_unix.c
View File

@@ -633,7 +633,6 @@ static int unixOpenReadWrite(
static int unixOpenExclusive(const char *zFilename, OsFile **pId, int delFlag){ static int unixOpenExclusive(const char *zFilename, OsFile **pId, int delFlag){
int rc; int rc;
unixFile f; unixFile f;
int fd;
assert( 0==*pId ); assert( 0==*pId );
if( access(zFilename, 0)==0 ){ if( access(zFilename, 0)==0 ){

4
src/pager.c
View File

@@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while ** file simultaneously, or one process from reading the database while
** another is writing. ** another is writing.
** **
** @(#) $Id: pager.c,v 1.223 2005/12/06 12:52:59 danielk1977 Exp $ ** @(#) $Id: pager.c,v 1.224 2005/12/09 20:02:05 drh Exp $
*/ */
#ifndef SQLITE_OMIT_DISKIO #ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h" #include "sqliteInt.h"
@@ -950,7 +950,7 @@ static int pager_unwritelock(Pager *pPager){
** only the middle sector is corrupt, we will still have a reasonable ** only the middle sector is corrupt, we will still have a reasonable
** chance of failing the checksum and thus detecting the problem. ** chance of failing the checksum and thus detecting the problem.
*/ */
static u32 pager_cksum(Pager *pPager, Pgno pgno, const char *aData){ static u32 pager_cksum(Pager *pPager, Pgno pgno, const u8 *aData){
u32 cksum = pPager->cksumInit; u32 cksum = pPager->cksumInit;
int i = pPager->pageSize-200; int i = pPager->pageSize-200;
while( i>0 ){ while( i>0 ){

12
src/parse.y
View File

@@ -14,7 +14,7 @@
** the parser. Lemon will also generate a header file containing ** the parser. Lemon will also generate a header file containing
** numeric codes for all of the tokens. ** numeric codes for all of the tokens.
** **
** @(#) $Id: parse.y,v 1.186 2005/12/06 17:19:11 danielk1977 Exp $ ** @(#) $Id: parse.y,v 1.187 2005/12/09 20:02:05 drh Exp $
*/ */
// All token codes are small integers with #defines that begin with "TK_" // All token codes are small integers with #defines that begin with "TK_"
@@ -230,8 +230,8 @@ typetoken(A) ::= typename(X) LP signed COMMA signed RP(Y). {
typename(A) ::= ids(X). {A = X;} typename(A) ::= ids(X). {A = X;}
typename(A) ::= typename(X) ids(Y). {A.z=X.z; A.n=Y.n+(Y.z-X.z);} typename(A) ::= typename(X) ids(Y). {A.z=X.z; A.n=Y.n+(Y.z-X.z);}
%type signed {int} %type signed {int}
signed(A) ::= plus_num(X). { A = atoi(X.z); } signed(A) ::= plus_num(X). { A = atoi((char*)X.z); }
signed(A) ::= minus_num(X). { A = -atoi(X.z); } signed(A) ::= minus_num(X). { A = -atoi((char*)X.z); }
// "carglist" is a list of additional constraints that come after the // "carglist" is a list of additional constraints that come after the
// column name and column type in a CREATE TABLE statement. // column name and column type in a CREATE TABLE statement.
@@ -264,7 +264,7 @@ ccons ::= CHECK LP expr(X) RP. {sqlite3AddCheckConstraint(pParse,X);}
ccons ::= REFERENCES nm(T) idxlist_opt(TA) refargs(R). ccons ::= REFERENCES nm(T) idxlist_opt(TA) refargs(R).
{sqlite3CreateForeignKey(pParse,0,&T,TA,R);} {sqlite3CreateForeignKey(pParse,0,&T,TA,R);}
ccons ::= defer_subclause(D). {sqlite3DeferForeignKey(pParse,D);} ccons ::= defer_subclause(D). {sqlite3DeferForeignKey(pParse,D);}
ccons ::= COLLATE id(C). {sqlite3AddCollateType(pParse, C.z, C.n);} ccons ::= COLLATE id(C). {sqlite3AddCollateType(pParse, (char*)C.z, C.n);}
// The optional AUTOINCREMENT keyword // The optional AUTOINCREMENT keyword
%type autoinc {int} %type autoinc {int}
@@ -853,7 +853,7 @@ idxlist(A) ::= idxlist(X) COMMA idxitem(Y) collate(C) sortorder. {
Expr *p = 0; Expr *p = 0;
if( C.n>0 ){ if( C.n>0 ){
p = sqlite3Expr(TK_COLUMN, 0, 0, 0); p = sqlite3Expr(TK_COLUMN, 0, 0, 0);
if( p ) p->pColl = sqlite3LocateCollSeq(pParse, C.z, C.n); if( p ) p->pColl = sqlite3LocateCollSeq(pParse, (char*)C.z, C.n);
} }
A = sqlite3ExprListAppend(X, p, &Y); A = sqlite3ExprListAppend(X, p, &Y);
} }
@@ -861,7 +861,7 @@ idxlist(A) ::= idxitem(Y) collate(C) sortorder. {
Expr *p = 0; Expr *p = 0;
if( C.n>0 ){ if( C.n>0 ){
p = sqlite3Expr(TK_COLUMN, 0, 0, 0); p = sqlite3Expr(TK_COLUMN, 0, 0, 0);
if( p ) p->pColl = sqlite3LocateCollSeq(pParse, C.z, C.n); if( p ) p->pColl = sqlite3LocateCollSeq(pParse, (char*)C.z, C.n);
} }
A = sqlite3ExprListAppend(0, p, &Y); A = sqlite3ExprListAppend(0, p, &Y);
} }

6
src/pragma.c
View File

@@ -11,7 +11,7 @@
************************************************************************* *************************************************************************
** This file contains code used to implement the PRAGMA command. ** This file contains code used to implement the PRAGMA command.
** **
** $Id: pragma.c,v 1.106 2005/12/08 18:12:56 drh Exp $ ** $Id: pragma.c,v 1.107 2005/12/09 20:02:05 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include "os.h" #include "os.h"
@@ -36,7 +36,7 @@
** to support legacy SQL code. The safety level used to be boolean ** to support legacy SQL code. The safety level used to be boolean
** and older scripts may have used numbers 0 for OFF and 1 for ON. ** and older scripts may have used numbers 0 for OFF and 1 for ON.
*/ */
static int getSafetyLevel(const u8 *z){ static int getSafetyLevel(const char *z){
/* 123456789 123456789 */ /* 123456789 123456789 */
static const char zText[] = "onoffalseyestruefull"; static const char zText[] = "onoffalseyestruefull";
static const u8 iOffset[] = {0, 1, 2, 4, 9, 12, 16}; static const u8 iOffset[] = {0, 1, 2, 4, 9, 12, 16};
@@ -58,7 +58,7 @@ static int getSafetyLevel(const u8 *z){
/* /*
** Interpret the given string as a boolean value. ** Interpret the given string as a boolean value.
*/ */
static int getBoolean(const u8 *z){ static int getBoolean(const char *z){
return getSafetyLevel(z)&1; return getSafetyLevel(z)&1;
} }

3
src/prepare.c
View File

@@ -13,7 +13,7 @@
** interface, and routines that contribute to loading the database schema ** interface, and routines that contribute to loading the database schema
** from disk. ** from disk.
** **
** $Id: prepare.c,v 1.6 2005/12/09 14:25:08 danielk1977 Exp $ ** $Id: prepare.c,v 1.7 2005/12/09 20:02:05 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include "os.h" #include "os.h"
@@ -478,7 +478,6 @@ int sqlite3_prepare(
} }
#endif #endif
prepare_out:
if( sqlite3SafetyOff(db) ){ if( sqlite3SafetyOff(db) ){
rc = SQLITE_MISUSE; rc = SQLITE_MISUSE;
} }

2
src/printf.c
View File

@@ -627,7 +627,7 @@ static int vxprintf(
case etTOKEN: { case etTOKEN: {
Token *pToken = va_arg(ap, Token*); Token *pToken = va_arg(ap, Token*);
if( pToken && pToken->z ){ if( pToken && pToken->z ){
(*func)(arg, pToken->z, pToken->n); (*func)(arg, (char*)pToken->z, pToken->n);
} }
length = width = 0; length = width = 0;
break; break;

18
src/select.c
View File

@@ -12,7 +12,7 @@
** This file contains C code routines that are called by the parser ** This file contains C code routines that are called by the parser
** to handle SELECT statements in SQLite. ** to handle SELECT statements in SQLite.
** **
** $Id: select.c,v 1.281 2005/12/06 12:52:59 danielk1977 Exp $ ** $Id: select.c,v 1.282 2005/12/09 20:02:05 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
@@ -109,7 +109,7 @@ int sqlite3JoinType(Parse *pParse, Token *pA, Token *pB, Token *pC){
p = apAll[i]; p = apAll[i];
for(j=0; j<sizeof(keywords)/sizeof(keywords[0]); j++){ for(j=0; j<sizeof(keywords)/sizeof(keywords[0]); j++){
if( p->n==keywords[j].nChar if( p->n==keywords[j].nChar
&& sqlite3StrNICmp(p->z, keywords[j].zKeyword, p->n)==0 ){ && sqlite3StrNICmp((char*)p->z, keywords[j].zKeyword, p->n)==0 ){
jointype |= keywords[j].code; jointype |= keywords[j].code;
break; break;
} }
@@ -154,7 +154,7 @@ static int columnIndex(Table *pTab, const char *zCol){
** Set the value of a token to a '\000'-terminated string. ** Set the value of a token to a '\000'-terminated string.
*/ */
static void setToken(Token *p, const char *z){ static void setToken(Token *p, const char *z){
p->z = z; p->z = (u8*)z;
p->n = z ? strlen(z) : 0; p->n = z ? strlen(z) : 0;
p->dyn = 0; p->dyn = 0;
} }
@@ -632,7 +632,7 @@ static KeyInfo *keyInfoFromExprList(Parse *pParse, ExprList *pList){
nExpr = pList->nExpr; nExpr = pList->nExpr;
pInfo = sqliteMalloc( sizeof(*pInfo) + nExpr*(sizeof(CollSeq*)+1) ); pInfo = sqliteMalloc( sizeof(*pInfo) + nExpr*(sizeof(CollSeq*)+1) );
if( pInfo ){ if( pInfo ){
pInfo->aSortOrder = (char*)&pInfo->aColl[nExpr]; pInfo->aSortOrder = (u8*)&pInfo->aColl[nExpr];
pInfo->nField = nExpr; pInfo->nField = nExpr;
pInfo->enc = db->enc; pInfo->enc = db->enc;
for(i=0, pItem=pList->a; i<nExpr; i++, pItem++){ for(i=0, pItem=pList->a; i<nExpr; i++, pItem++){
@@ -885,7 +885,7 @@ static void generateColumnNames(
zCol = pTab->aCol[iCol].zName; zCol = pTab->aCol[iCol].zName;
} }
if( !shortNames && !fullNames && p->span.z && p->span.z[0] ){ if( !shortNames && !fullNames && p->span.z && p->span.z[0] ){
sqlite3VdbeSetColName(v, i, p->span.z, p->span.n); sqlite3VdbeSetColName(v, i, (char*)p->span.z, p->span.n);
}else if( fullNames || (!shortNames && pTabList->nSrc>1) ){ }else if( fullNames || (!shortNames && pTabList->nSrc>1) ){
char *zName = 0; char *zName = 0;
char *zTab; char *zTab;
@@ -898,7 +898,7 @@ static void generateColumnNames(
sqlite3VdbeSetColName(v, i, zCol, strlen(zCol)); sqlite3VdbeSetColName(v, i, zCol, strlen(zCol));
} }
}else if( p->span.z && p->span.z[0] ){ }else if( p->span.z && p->span.z[0] ){
sqlite3VdbeSetColName(v, i, p->span.z, p->span.n); sqlite3VdbeSetColName(v, i, (char*)p->span.z, p->span.n);
/* sqlite3VdbeCompressSpace(v, addr); */ /* sqlite3VdbeCompressSpace(v, addr); */
}else{ }else{
char zName[30]; char zName[30];
@@ -2117,7 +2117,7 @@ static int flattenSubquery(
for(i=0; i<pList->nExpr; i++){ for(i=0; i<pList->nExpr; i++){
Expr *pExpr; Expr *pExpr;
if( pList->a[i].zName==0 && (pExpr = pList->a[i].pExpr)->span.z!=0 ){ if( pList->a[i].zName==0 && (pExpr = pList->a[i].pExpr)->span.z!=0 ){
pList->a[i].zName = sqliteStrNDup(pExpr->span.z, pExpr->span.n); pList->a[i].zName = sqliteStrNDup((char*)pExpr->span.z, pExpr->span.n);
} }
} }
if( isAgg ){ if( isAgg ){
@@ -2216,9 +2216,9 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){
pList = pExpr->pList; pList = pExpr->pList;
if( pList==0 || pList->nExpr!=1 ) return 0; if( pList==0 || pList->nExpr!=1 ) return 0;
if( pExpr->token.n!=3 ) return 0; if( pExpr->token.n!=3 ) return 0;
if( sqlite3StrNICmp(pExpr->token.z,"min",3)==0 ){ if( sqlite3StrNICmp((char*)pExpr->token.z,"min",3)==0 ){
seekOp = OP_Rewind; seekOp = OP_Rewind;
}else if( sqlite3StrNICmp(pExpr->token.z,"max",3)==0 ){ }else if( sqlite3StrNICmp((char*)pExpr->token.z,"max",3)==0 ){
seekOp = OP_Last; seekOp = OP_Last;
}else{ }else{
return 0; return 0;

4
src/sqliteInt.h
View File

@@ -11,7 +11,7 @@
************************************************************************* *************************************************************************
** Internal interface definitions for SQLite. ** Internal interface definitions for SQLite.
** **
** @(#) $Id: sqliteInt.h,v 1.432 2005/12/09 14:39:04 danielk1977 Exp $ ** @(#) $Id: sqliteInt.h,v 1.433 2005/12/09 20:02:06 drh Exp $
*/ */
#ifndef _SQLITEINT_H_ #ifndef _SQLITEINT_H_
#define _SQLITEINT_H_ #define _SQLITEINT_H_
@@ -1435,7 +1435,7 @@ void sqlite3SetString(char **, ...);
void sqlite3ErrorMsg(Parse*, const char*, ...); void sqlite3ErrorMsg(Parse*, const char*, ...);
void sqlite3Dequote(char*); void sqlite3Dequote(char*);
void sqlite3DequoteExpr(Expr*); void sqlite3DequoteExpr(Expr*);
int sqlite3KeywordCode(const char*, int); int sqlite3KeywordCode(const unsigned char*, int);
int sqlite3RunParser(Parse*, const char*, char **); int sqlite3RunParser(Parse*, const char*, char **);
void sqlite3FinishCoding(Parse*); void sqlite3FinishCoding(Parse*);
Expr *sqlite3Expr(int, Expr*, Expr*, const Token*); Expr *sqlite3Expr(int, Expr*, Expr*, const Token*);

4
src/tokenize.c
View File

@@ -15,7 +15,7 @@
** individual tokens and sends those tokens one-by-one over to the ** individual tokens and sends those tokens one-by-one over to the
** parser for analysis. ** parser for analysis.
** **
** $Id: tokenize.c,v 1.109 2005/12/06 12:53:00 danielk1977 Exp $ ** $Id: tokenize.c,v 1.110 2005/12/09 20:02:06 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include "os.h" #include "os.h"
@@ -360,7 +360,7 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
pParse->zTail = pParse->zSql = zSql; pParse->zTail = pParse->zSql = zSql;
while( sqlite3Tsd()->mallocFailed==0 && zSql[i]!=0 ){ while( sqlite3Tsd()->mallocFailed==0 && zSql[i]!=0 ){
assert( i>=0 ); assert( i>=0 );
pParse->sLastToken.z = &zSql[i]; pParse->sLastToken.z = (u8*)&zSql[i];
assert( pParse->sLastToken.dyn==0 ); assert( pParse->sLastToken.dyn==0 );
pParse->sLastToken.n = getToken((unsigned char*)&zSql[i],&tokenType); pParse->sLastToken.n = getToken((unsigned char*)&zSql[i],&tokenType);
i += pParse->sLastToken.n; i += pParse->sLastToken.n;

8
src/trigger.c
View File

@@ -237,7 +237,7 @@ void sqlite3FinishTrigger(
addr = sqlite3VdbeAddOpList(v, ArraySize(insertTrig), insertTrig); addr = sqlite3VdbeAddOpList(v, ArraySize(insertTrig), insertTrig);
sqlite3VdbeChangeP3(v, addr+2, pTrig->name, 0); sqlite3VdbeChangeP3(v, addr+2, pTrig->name, 0);
sqlite3VdbeChangeP3(v, addr+3, pTrig->table, 0); sqlite3VdbeChangeP3(v, addr+3, pTrig->table, 0);
sqlite3VdbeChangeP3(v, addr+6, pAll->z, pAll->n); sqlite3VdbeChangeP3(v, addr+6, (char*)pAll->z, pAll->n);
sqlite3ChangeCookie(db, v, pTrig->iDb); sqlite3ChangeCookie(db, v, pTrig->iDb);
sqlite3VdbeAddOp(v, OP_Close, 0, 0); sqlite3VdbeAddOp(v, OP_Close, 0, 0);
sqlite3VdbeOp3(v, OP_ParseSchema, pTrig->iDb, 0, sqlite3VdbeOp3(v, OP_ParseSchema, pTrig->iDb, 0,
@@ -278,7 +278,7 @@ triggerfinish_cleanup:
*/ */
static void sqlitePersistTriggerStep(TriggerStep *p){ static void sqlitePersistTriggerStep(TriggerStep *p){
if( p->target.z ){ if( p->target.z ){
p->target.z = sqliteStrNDup(p->target.z, p->target.n); p->target.z = (u8*)sqliteStrNDup((char*)p->target.z, p->target.n);
p->target.dyn = 1; p->target.dyn = 1;
} }
if( p->pSelect ){ if( p->pSelect ){
@@ -623,8 +623,8 @@ static SrcList *targetSrcList(
iDb = pStep->pTrig->iDb; iDb = pStep->pTrig->iDb;
if( iDb==0 || iDb>=2 ){ if( iDb==0 || iDb>=2 ){
assert( iDb<pParse->db->nDb ); assert( iDb<pParse->db->nDb );
sDb.z = pParse->db->aDb[iDb].zName; sDb.z = (u8*)pParse->db->aDb[iDb].zName;
sDb.n = strlen(sDb.z); sDb.n = strlen((char*)sDb.z);
pSrc = sqlite3SrcListAppend(0, &sDb, &pStep->target); pSrc = sqlite3SrcListAppend(0, &sDb, &pStep->target);
} else { } else {
pSrc = sqlite3SrcListAppend(0, &pStep->target, 0); pSrc = sqlite3SrcListAppend(0, &pStep->target, 0);

10
src/utf.c
View File

@@ -12,7 +12,7 @@
** This file contains routines used to translate between UTF-8, ** This file contains routines used to translate between UTF-8,
** UTF-16, UTF-16BE, and UTF-16LE. ** UTF-16, UTF-16BE, and UTF-16LE.
** **
** $Id: utf.c,v 1.32 2005/01/28 01:29:08 drh Exp $ ** $Id: utf.c,v 1.33 2005/12/09 20:02:06 drh Exp $
** **
** Notes on UTF-8: ** Notes on UTF-8:
** **
@@ -272,7 +272,7 @@ int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){
assert( rc==SQLITE_NOMEM ); assert( rc==SQLITE_NOMEM );
return SQLITE_NOMEM; return SQLITE_NOMEM;
} }
zIn = pMem->z; zIn = (u8*)pMem->z;
zTerm = &zIn[pMem->n]; zTerm = &zIn[pMem->n];
while( zIn<zTerm ){ while( zIn<zTerm ){
temp = *zIn; temp = *zIn;
@@ -308,7 +308,7 @@ int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){
** obtained from malloc(), or Mem.zShort, if it large enough and not in ** obtained from malloc(), or Mem.zShort, if it large enough and not in
** use, or the zShort array on the stack (see above). ** use, or the zShort array on the stack (see above).
*/ */
zIn = pMem->z; zIn = (u8*)pMem->z;
zTerm = &zIn[pMem->n]; zTerm = &zIn[pMem->n];
if( len>NBFS ){ if( len>NBFS ){
zOut = sqliteMallocRaw(len); zOut = sqliteMallocRaw(len);
@@ -360,12 +360,12 @@ int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){
pMem->enc = desiredEnc; pMem->enc = desiredEnc;
if( zOut==zShort ){ if( zOut==zShort ){
memcpy(pMem->zShort, zOut, len); memcpy(pMem->zShort, zOut, len);
zOut = pMem->zShort; zOut = (u8*)pMem->zShort;
pMem->flags |= (MEM_Term|MEM_Short); pMem->flags |= (MEM_Term|MEM_Short);
}else{ }else{
pMem->flags |= (MEM_Term|MEM_Dyn); pMem->flags |= (MEM_Term|MEM_Dyn);
} }
pMem->z = zOut; pMem->z = (char*)zOut;
translate_out: translate_out:
#if defined(TRANSLATE_TRACE) && defined(SQLITE_DEBUG) #if defined(TRANSLATE_TRACE) && defined(SQLITE_DEBUG)

4
src/vacuum.c
View File

@@ -14,7 +14,7 @@
** Most of the code in this file may be omitted by defining the ** Most of the code in this file may be omitted by defining the
** SQLITE_OMIT_VACUUM macro. ** SQLITE_OMIT_VACUUM macro.
** **
** $Id: vacuum.c,v 1.52 2005/12/09 14:25:09 danielk1977 Exp $ ** $Id: vacuum.c,v 1.53 2005/12/09 20:02:06 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include "vdbeInt.h" #include "vdbeInt.h"
@@ -59,7 +59,7 @@ static int execExecSql(sqlite3 *db, const char *zSql){
if( rc!=SQLITE_OK ) return rc; if( rc!=SQLITE_OK ) return rc;
while( SQLITE_ROW==sqlite3_step(pStmt) ){ while( SQLITE_ROW==sqlite3_step(pStmt) ){
rc = execSql(db, sqlite3_column_text(pStmt, 0)); rc = execSql(db, (char*)sqlite3_column_text(pStmt, 0));
if( rc!=SQLITE_OK ){ if( rc!=SQLITE_OK ){
sqlite3_finalize(pStmt); sqlite3_finalize(pStmt);
return rc; return rc;

27
src/vdbe.c
View File

@@ -43,7 +43,7 @@
** in this file for details. If in doubt, do not deviate from existing ** in this file for details. If in doubt, do not deviate from existing
** commenting and indentation practices when changing or adding code. ** commenting and indentation practices when changing or adding code.
** **
** $Id: vdbe.c,v 1.503 2005/12/09 14:25:09 danielk1977 Exp $ ** $Id: vdbe.c,v 1.504 2005/12/09 20:02:06 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include "os.h" #include "os.h"
@@ -1885,7 +1885,7 @@ case OP_Column: {
payloadSize = 0; payloadSize = 0;
}else if( pC->cacheValid ){ }else if( pC->cacheValid ){
payloadSize = pC->payloadSize; payloadSize = pC->payloadSize;
zRec = pC->aRow; zRec = (char*)pC->aRow;
}else if( pC->isIndex ){ }else if( pC->isIndex ){
i64 payloadSize64; i64 payloadSize64;
sqlite3BtreeKeySize(pCrsr, &payloadSize64); sqlite3BtreeKeySize(pCrsr, &payloadSize64);
@@ -1952,12 +1952,13 @@ case OP_Column: {
** the record. ** the record.
*/ */
if( avail>=payloadSize ){ if( avail>=payloadSize ){
zRec = pC->aRow = zData; zRec = zData;
pC->aRow = (u8*)zData;
}else{ }else{
pC->aRow = 0; pC->aRow = 0;
} }
} }
idx = sqlite3GetVarint32(zData, &szHdr); idx = sqlite3GetVarint32((u8*)zData, &szHdr);
/* The KeyFetch() or DataFetch() above are fast and will get the entire /* The KeyFetch() or DataFetch() above are fast and will get the entire
@@ -1984,7 +1985,7 @@ case OP_Column: {
i = 0; i = 0;
while( idx<szHdr && i<nField && offset<=payloadSize ){ while( idx<szHdr && i<nField && offset<=payloadSize ){
aOffset[i] = offset; aOffset[i] = offset;
idx += sqlite3GetVarint32(&zData[idx], &aType[i]); idx += sqlite3GetVarint32((u8*)&zData[idx], &aType[i]);
offset += sqlite3VdbeSerialTypeLen(aType[i]); offset += sqlite3VdbeSerialTypeLen(aType[i]);
i++; i++;
} }
@@ -2038,7 +2039,7 @@ case OP_Column: {
} }
zData = sMem.z; zData = sMem.z;
} }
sqlite3VdbeSerialGet(zData, aType[p2], pTos); sqlite3VdbeSerialGet((u8*)zData, aType[p2], pTos);
pTos->enc = db->enc; pTos->enc = db->enc;
}else{ }else{
if( pOp->p3type==P3_MEM ){ if( pOp->p3type==P3_MEM ){
@@ -2198,7 +2199,7 @@ case OP_MakeRecord: {
goto no_mem; goto no_mem;
} }
}else{ }else{
zNewRecord = zTemp; zNewRecord = (u8*)zTemp;
} }
/* Write the record */ /* Write the record */
@@ -2232,7 +2233,7 @@ case OP_MakeRecord: {
pTos->flags = MEM_Blob | MEM_Short; pTos->flags = MEM_Blob | MEM_Short;
}else{ }else{
assert( zNewRecord!=(unsigned char *)zTemp ); assert( zNewRecord!=(unsigned char *)zTemp );
pTos->z = zNewRecord; pTos->z = (char*)zNewRecord;
pTos->flags = MEM_Blob | MEM_Dyn; pTos->flags = MEM_Blob | MEM_Dyn;
pTos->xDel = 0; pTos->xDel = 0;
} }
@@ -2929,7 +2930,7 @@ case OP_IsUnique: { /* no-push */
zKey = pNos->z; zKey = pNos->z;
nKey = pNos->n; nKey = pNos->n;
szRowid = sqlite3VdbeIdxRowidLen(nKey, zKey); szRowid = sqlite3VdbeIdxRowidLen(nKey, (u8*)zKey);
len = nKey-szRowid; len = nKey-szRowid;
/* Search for an entry in P1 where all but the last four bytes match K. /* Search for an entry in P1 where all but the last four bytes match K.
@@ -2946,7 +2947,7 @@ case OP_IsUnique: { /* no-push */
break; break;
} }
} }
rc = sqlite3VdbeIdxKeyCompare(pCx, len, zKey, &res); rc = sqlite3VdbeIdxKeyCompare(pCx, len, (u8*)zKey, &res);
if( rc!=SQLITE_OK ) goto abort_due_to_error; if( rc!=SQLITE_OK ) goto abort_due_to_error;
if( res>0 ){ if( res>0 ){
pc = pOp->p2 - 1; pc = pOp->p2 - 1;
@@ -3722,7 +3723,7 @@ case OP_IdxGE: { /* no-push */
assert( pC->deferredMoveto==0 ); assert( pC->deferredMoveto==0 );
*pC->pIncrKey = pOp->p3!=0; *pC->pIncrKey = pOp->p3!=0;
assert( pOp->p3==0 || pOp->opcode!=OP_IdxGT ); assert( pOp->p3==0 || pOp->opcode!=OP_IdxGT );
rc = sqlite3VdbeIdxKeyCompare(pC, pTos->n, pTos->z, &res); rc = sqlite3VdbeIdxKeyCompare(pC, pTos->n, (u8*)pTos->z, &res);
*pC->pIncrKey = 0; *pC->pIncrKey = 0;
if( rc!=SQLITE_OK ){ if( rc!=SQLITE_OK ){
break; break;
@@ -3760,9 +3761,9 @@ case OP_IdxIsNull: { /* no-push */
assert( pTos->flags & MEM_Blob ); assert( pTos->flags & MEM_Blob );
z = pTos->z; z = pTos->z;
n = pTos->n; n = pTos->n;
k = sqlite3GetVarint32(z, &serial_type); k = sqlite3GetVarint32((u8*)z, &serial_type);
for(; k<n && i>0; i--){ for(; k<n && i>0; i--){
k += sqlite3GetVarint32(&z[k], &serial_type); k += sqlite3GetVarint32((u8*)&z[k], &serial_type);
if( serial_type==0 ){ /* Serial type 0 is a NULL */ if( serial_type==0 ){ /* Serial type 0 is a NULL */
pc = pOp->p2-1; pc = pOp->p2-1;
break; break;

8
src/vdbeaux.c
View File

@@ -1780,10 +1780,10 @@ int sqlite3VdbeIdxRowid(BtCursor *pCur, i64 *rowid){
if( rc ){ if( rc ){
return rc; return rc;
} }
sqlite3GetVarint32(m.z, &szHdr); sqlite3GetVarint32((u8*)m.z, &szHdr);
sqlite3GetVarint32(&m.z[szHdr-1], &typeRowid); sqlite3GetVarint32((u8*)&m.z[szHdr-1], &typeRowid);
lenRowid = sqlite3VdbeSerialTypeLen(typeRowid); lenRowid = sqlite3VdbeSerialTypeLen(typeRowid);
sqlite3VdbeSerialGet(&m.z[m.n-lenRowid], typeRowid, &v); sqlite3VdbeSerialGet((u8*)&m.z[m.n-lenRowid], typeRowid, &v);
*rowid = v.i; *rowid = v.i;
sqlite3VdbeMemRelease(&m); sqlite3VdbeMemRelease(&m);
return SQLITE_OK; return SQLITE_OK;
@@ -1819,7 +1819,7 @@ int sqlite3VdbeIdxKeyCompare(
if( rc ){ if( rc ){
return rc; return rc;
} }
lenRowid = sqlite3VdbeIdxRowidLen(m.n, m.z); lenRowid = sqlite3VdbeIdxRowidLen(m.n, (u8*)m.z);
*res = sqlite3VdbeRecordCompare(pC->pKeyInfo, m.n-lenRowid, m.z, nKey, pKey); *res = sqlite3VdbeRecordCompare(pC->pKeyInfo, m.n-lenRowid, m.z, nKey, pKey);
sqlite3VdbeMemRelease(&m); sqlite3VdbeMemRelease(&m);
return SQLITE_OK; return SQLITE_OK;

12
src/vdbemem.c
View File

@@ -83,7 +83,7 @@ int sqlite3VdbeMemDynamicify(Mem *pMem){
memcpy(z, pMem->z, n ); memcpy(z, pMem->z, n );
z[n] = 0; z[n] = 0;
z[n+1] = 0; z[n+1] = 0;
pMem->z = z; pMem->z = (char*)z;
pMem->flags &= ~(MEM_Ephem|MEM_Static|MEM_Short); pMem->flags &= ~(MEM_Ephem|MEM_Static|MEM_Short);
return SQLITE_OK; return SQLITE_OK;
} }
@@ -103,7 +103,7 @@ int sqlite3VdbeMemMakeWriteable(Mem *pMem){
assert( (pMem->flags & MEM_Dyn)==0 ); assert( (pMem->flags & MEM_Dyn)==0 );
assert( pMem->flags & (MEM_Str|MEM_Blob) ); assert( pMem->flags & (MEM_Str|MEM_Blob) );
if( (n = pMem->n)+2<sizeof(pMem->zShort) ){ if( (n = pMem->n)+2<sizeof(pMem->zShort) ){
z = pMem->zShort; z = (u8*)pMem->zShort;
pMem->flags |= MEM_Short|MEM_Term; pMem->flags |= MEM_Short|MEM_Term;
}else{ }else{
z = sqliteMallocRaw( n+2 ); z = sqliteMallocRaw( n+2 );
@@ -116,7 +116,7 @@ int sqlite3VdbeMemMakeWriteable(Mem *pMem){
memcpy(z, pMem->z, n ); memcpy(z, pMem->z, n );
z[n] = 0; z[n] = 0;
z[n+1] = 0; z[n+1] = 0;
pMem->z = z; pMem->z = (char*)z;
pMem->flags &= ~(MEM_Ephem|MEM_Static); pMem->flags &= ~(MEM_Ephem|MEM_Static);
return SQLITE_OK; return SQLITE_OK;
} }
@@ -172,7 +172,7 @@ int sqlite3VdbeMemNulTerminate(Mem *pMem){
int sqlite3VdbeMemStringify(Mem *pMem, int enc){ int sqlite3VdbeMemStringify(Mem *pMem, int enc){
int rc = SQLITE_OK; int rc = SQLITE_OK;
int fg = pMem->flags; int fg = pMem->flags;
u8 *z = pMem->zShort; char *z = pMem->zShort;
assert( !(fg&(MEM_Str|MEM_Blob)) ); assert( !(fg&(MEM_Str|MEM_Blob)) );
assert( fg&(MEM_Int|MEM_Real) ); assert( fg&(MEM_Int|MEM_Real) );
@@ -799,7 +799,7 @@ int sqlite3ValueFromExpr(
op = pExpr->op; op = pExpr->op;
if( op==TK_STRING || op==TK_FLOAT || op==TK_INTEGER ){ if( op==TK_STRING || op==TK_FLOAT || op==TK_INTEGER ){
zVal = sqliteStrNDup(pExpr->token.z, pExpr->token.n); zVal = sqliteStrNDup((char*)pExpr->token.z, pExpr->token.n);
pVal = sqlite3ValueNew(); pVal = sqlite3ValueNew();
if( !zVal || !pVal ) goto no_mem; if( !zVal || !pVal ) goto no_mem;
sqlite3Dequote(zVal); sqlite3Dequote(zVal);
@@ -819,7 +819,7 @@ int sqlite3ValueFromExpr(
else if( op==TK_BLOB ){ else if( op==TK_BLOB ){
int nVal; int nVal;
pVal = sqlite3ValueNew(); pVal = sqlite3ValueNew();
zVal = sqliteStrNDup(pExpr->token.z+1, pExpr->token.n-1); zVal = sqliteStrNDup((char*)pExpr->token.z+1, pExpr->token.n-1);
if( !zVal || !pVal ) goto no_mem; if( !zVal || !pVal ) goto no_mem;
sqlite3Dequote(zVal); sqlite3Dequote(zVal);
nVal = strlen(zVal)/2; nVal = strlen(zVal)/2;

4
tool/mkkeywordhash.c
View File

@@ -495,8 +495,8 @@ int main(int argc, char **argv){
printf(" }\n"); printf(" }\n");
printf(" return TK_ID;\n"); printf(" return TK_ID;\n");
printf("}\n"); printf("}\n");
printf("int sqlite3KeywordCode(const char *z, int n){\n"); printf("int sqlite3KeywordCode(const unsigned char *z, int n){\n");
printf(" return keywordCode(z, n);\n"); printf(" return keywordCode((char*)z, n);\n");
printf("}\n"); printf("}\n");
return 0; return 0;