mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix harmless compiler warnings in the Tcl interface.

Browse Source 
FossilOrigin-Name: 35bc81f5ad4503c0db03127ba3c2ee4ce5227448
This commit is contained in:
mistachkin 2014-01-24 17:03:55 +00:00
parent 05d3dc29c5
commit 6ef5e12e1f
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Add\stest\scases\sfor\sLIMIT\sand\sORDER\sBY\son\srecursive\sCTEs. C Fix\sharmless\scompiler\swarnings\sin\sthe\sTcl\sinterface.
D 2014-01-24T16:57:42.837 D 2014-01-24T17:03:55.776
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -228,7 +228,7 @@ F src/sqliteInt.h 87a90ad4818ac5d68d3463eb7fe3ed96e5209b25
F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
F src/tclsqlite.c 46073db71011b6542fde1f234c56a076d5ff23f9 F src/tclsqlite.c 21ca0043d7c48cde5dabed5c1116eee1be692f62
F src/test1.c 2401eee14a4309a7cfe2aeb2f30ad517a1d9c299 F src/test1.c 2401eee14a4309a7cfe2aeb2f30ad517a1d9c299
F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35 F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
@ -1152,7 +1152,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
P b1824344ea4918a13abbda4a3b7134d35fd867c4 P 67d6c42d44cb191368ce20f553b32fcb14bfc4d7
R 9a46b9863f9dd82900d571672109f9d1 R 4c6f56cfb9673c8d50f2c5c8d045a419
U dan U mistachkin
Z c5f919f56b9fa0112bb7211064a506d1 Z 1e8effcea2fae186977e2dc88d96ee04

2
manifest.uuid
View File

@ -1 +1 @@
67d6c42d44cb191368ce20f553b32fcb14bfc4d7 35bc81f5ad4503c0db03127ba3c2ee4ce5227448

16
src/tclsqlite.c
View File

@ -873,7 +873,7 @@ static int auth_callback(
const char *zArg3, const char *zArg3,
const char *zArg4 const char *zArg4
){ ){
char *zCode; const char *zCode;
Tcl_DString str; Tcl_DString str;
int rc; int rc;
const char *zReply; const char *zReply;
@ -999,7 +999,7 @@ static int DbTransPostCmd(
Tcl_Interp *interp, /* Tcl interpreter */ Tcl_Interp *interp, /* Tcl interpreter */
int result /* Result of evaluating SCRIPT */ int result /* Result of evaluating SCRIPT */
){ ){
static const char *azEnd[] = { static const char *const azEnd[] = {
"RELEASE _tcl_transaction", /* rc==TCL_ERROR, nTransaction!=0 */ "RELEASE _tcl_transaction", /* rc==TCL_ERROR, nTransaction!=0 */
"COMMIT", /* rc!=TCL_ERROR, nTransaction==0 */ "COMMIT", /* rc!=TCL_ERROR, nTransaction==0 */
"ROLLBACK TO _tcl_transaction ; RELEASE _tcl_transaction", "ROLLBACK TO _tcl_transaction ; RELEASE _tcl_transaction",
@ -1937,7 +1937,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
Tcl_AppendResult(interp, pDb->zCommit, 0); Tcl_AppendResult(interp, pDb->zCommit, 0);
} }
}else{ }else{
char *zCommit; const char *zCommit;
int len; int len;
if( pDb->zCommit ){ if( pDb->zCommit ){
Tcl_Free(pDb->zCommit); Tcl_Free(pDb->zCommit);
@ -2010,14 +2010,14 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
char *zSql; /* An SQL statement */ char *zSql; /* An SQL statement */
char *zLine; /* A single line of input from the file */ char *zLine; /* A single line of input from the file */
char **azCol; /* zLine[] broken up into columns */ char **azCol; /* zLine[] broken up into columns */
char *zCommit; /* How to commit changes */ const char *zCommit; /* How to commit changes */
FILE *in; /* The input file */ FILE *in; /* The input file */
int lineno = 0; /* Line number of input file */ int lineno = 0; /* Line number of input file */
char zLineNum[80]; /* Line number print buffer */ char zLineNum[80]; /* Line number print buffer */
Tcl_Obj *pResult; /* interp result */ Tcl_Obj *pResult; /* interp result */
char *zSep; const char *zSep;
char *zNull; const char *zNull;
if( objc<5 || objc>7 ){ if( objc<5 || objc>7 ){
Tcl_WrongNumArgs(interp, 2, objv, Tcl_WrongNumArgs(interp, 2, objv,
"CONFLICT-ALGORITHM TABLE FILENAME ?SEPARATOR? ?NULLINDICATOR?"); "CONFLICT-ALGORITHM TABLE FILENAME ?SEPARATOR? ?NULLINDICATOR?");
@ -2935,7 +2935,7 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
if( objc==2 ){ if( objc==2 ){
zArg = Tcl_GetStringFromObj(objv[1], 0); zArg = Tcl_GetStringFromObj(objv[1], 0);
if( strcmp(zArg,"-version")==0 ){ if( strcmp(zArg,"-version")==0 ){
Tcl_AppendResult(interp,sqlite3_version,0); Tcl_AppendResult(interp,sqlite3_libversion(),0);
return TCL_OK; return TCL_OK;
} }
if( strcmp(zArg,"-has-codec")==0 ){ if( strcmp(zArg,"-has-codec")==0 ){
@ -3017,7 +3017,7 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
zErrMsg = 0; zErrMsg = 0;
p = (SqliteDb*)Tcl_Alloc( sizeof(*p) ); p = (SqliteDb*)Tcl_Alloc( sizeof(*p) );
if( p==0 ){ if( p==0 ){
Tcl_SetResult(interp, "malloc failed", TCL_STATIC); Tcl_SetResult(interp, (char *)"malloc failed", TCL_STATIC);
return TCL_ERROR; return TCL_ERROR;
} }
memset(p, 0, sizeof(*p)); memset(p, 0, sizeof(*p));