Overview
SHA1 Hash: | 2a707334c9320fa24f6353d00415f6c0e49f1464 |
---|---|
Date: | 2007-11-22 01:53:24 |
User: | drh |
Comment: | Fix some compiler warnings. Comment changes on non-functioning code in tkt.c. |
Timelines: | ancestors | descendants | both | trunk |
Other Links: | files | ZIP archive | manifest |
Tags And Properties
- branch=trunk inherited from [a28c83647d]
- sym-trunk inherited from [a28c83647d]
Changes
[hide diffs]Modified src/setup.c from [d38440e1a3] to [6f12e979c3].
@@ -482,13 +482,13 @@ const char *zLabel, /* The text label on the textarea */ int rows, /* Rows in the textarea */ int cols, /* Columns in the textarea */ const char *zVar, /* The corresponding row in the VAR table */ const char *zQP, /* The query parameter */ - char *zDflt /* Default value if VAR table entry does not exist */ + const char *zDflt /* Default value if VAR table entry does not exist */ ){ - const char *z = db_get(zVar, zDflt); + const char *z = db_get(zVar, (char*)zDflt); const char *zQ = P(zQP); if( zQ && strcmp(zQ,z)!=0 ){ db_set(zVar, zQ, 0); z = zQ; }
Modified src/subscript.c from [7a4e64645a] to [1ea8902693].
@@ -392,11 +392,11 @@ v.u.str.size = strlen(zValue); if( makeCopy ){ v.u.str.z = mprintf("%s", zValue); v.flags |= SBSVAL_DYN; }else{ - v.u.str.z = zValue; + v.u.str.z = (char*)zValue; } return sbs_store(&p->symTab, zName, -1, &v); } /*
Modified src/tkt.c from [739fe0dd6c] to [e32e47c61c].
@@ -84,13 +84,16 @@ return 0; } /* ** Update an entry of the TICKET table according to the information -** in the control file. +** in the control file given in p. Attempt to create the appropriate +** TICKET table entry if createFlag is true. If createFlag is false, +** that means we already know the entry exists and so we can save the +** work of trying to create it. */ -void ticket_insert(Manifest *p, int createFlag){ +void ticket_insert(Manifest *p, int createFlag, int checkTime){ Blob sql; Stmt q; int i; if( createFlag ){