Fix a couple of gcc warnings. (CVS 1615)

FossilOrigin-Name: 960f55f3ecbef4581c8cb7be860023ba10de4e96

diff --git a/manifest b/manifest
index 668b82ce8a5e89d60ddef0215b219e6def88ed36..245104126cf6edbc897d466e79c8fbab972d643c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Optimisation\sfor\sunicode\sencoding\sconversion\sroutines.\s(CVS\s1614)
-D 2004-06-18T04:24:54
+C Fix\sa\scouple\sof\sgcc\swarnings.\s(CVS\s1615)
+D 2004-06-18T06:02:35
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -28,7 +28,7 @@ F src/attach.c 93b8ecec4a8d7b4e9f2479e2327d90c9d01765e8
 F src/auth.c 204e1e9c45e64315589bc8b62cba5d9de29b6a3c
 F src/btree.c 0cf8a52a57a7eb13d50719114ee1fa353e89d7d3
 F src/btree.h 32f96abef464cf8765b23ca669acfe90d191fcc5
-F src/build.c f3f7634d21ae3d048c62bea98f99b2b4d2c0ae2b
+F src/build.c 44057a0aba7c57fb7a32ee4addd2e981fcb9de60
 F src/date.c 65b483caeb0e4dd663667d2f927caa058168ebff
 F src/delete.c a5191011b7429dff939df631b8bdcc1714b8d7aa
 F src/encode.c a876af473d1d636faa3dca51c7571f2e007eea37
@@ -44,7 +44,7 @@ F src/os.h 1cb5f0293a30288451fe3c0c73815cf208212ed1
 F src/os_common.h ba1b7306e16e2091718f2c48db0fe6c1d7a31bb8
 F src/os_mac.c 3d31e26be1411acfb7961033098631b4f3486fdf
 F src/os_mac.h 51d2445f47e182ed32d3bd6937f81070c6fd9bd4
-F src/os_unix.c 132864ff574571929f51b1b19b47e988a4468404
+F src/os_unix.c add5af1cc4ff726297338e4e96ac36d1a5658d2c
 F src/os_unix.h 1cd6133cf66dea704b8646b70b2dfdcbdd9b3738
 F src/os_win.c 337e973ee77797aaab4787e3477a5945fcd97266
 F src/os_win.h 004eec47b1780fcaf07420ddc2072294b698d48c
@@ -65,7 +65,7 @@ F src/test2.c db0a0c30b59f1639cb8c2572be06439402833cc8
 F src/test3.c 7247090d15a5a43823079b6fd8dad1ed3cccdedf
 F src/test4.c a921a69821fd30209589228e64f94e9f715b6fe2
 F src/test5.c 1b7c275b2929dbd034a567255d2aca339410d1d6
-F src/tokenize.c ec8d990bd297c68998cf7b4109b2832ec8b6f8ee
+F src/tokenize.c 900374b6b37f04748bcd48c2d29a41c251542935
 F src/trigger.c 3325207ea41d2d429e70370ce2ff987fd49b7ada
 F src/update.c f9a03233577e0c3d57234d1957963875fc941da2
 F src/utf.c 7464315fd4b627b96801444f3671f3e9930879c6
@@ -73,8 +73,8 @@ F src/util.c 9d9ef854e9a8744a7ebaee02ee26eb0aaa8a9987
 F src/vacuum.c f9561c8095407a970af4e6a304b77c4083433d3e
 F src/vdbe.c 2a0e908e46ea6822f215cb0f35ec31f5c2832629
 F src/vdbe.h 46f74444a213129bc4b5ce40124dd8ed613b0cde
-F src/vdbeInt.h 96a6e88b82386f2741f0addbe00a8bf38f8e8bfc
-F src/vdbeapi.c 229d40ead855cbf154eaf4ee5e5f3d7463100003
+F src/vdbeInt.h 54af2e00301cde7573b86ea8a9b29a2152e762f7
+F src/vdbeapi.c 1601fb2d015fc88ce3dd6a6a50cf44b6419fdbbf
 F src/vdbeaux.c dc0e7d3bdf3b6f322448b4bee29fe5bec656b4d4
 F src/vdbemem.c 9359c53386e070fea9f5403cab0c6f0cfe36496b
 F src/where.c 6507074d8ce3f78e7a4cd33f667f11e62020553e
@@ -106,7 +106,7 @@ F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2
 F test/date.test aed5030482ebc02bd8d386c6c86a29f694ab068d
 F test/delete.test ac14bd6df5f1581d646eebc013d6b844a885dcf6
 F test/enc.test dfdde0f660b592acbdafd107d15b2b7dd2a54f45
-F test/enc2.test 8b00df318822731ea545365629bc9f52d73a3c6f
+F test/enc2.test ffd3dbef6949c33f85b7152e465c88e29cbfbd81
 F test/expr.test 2262ade5e4e98e359b11e40b01cb3498ac7fa42b
 F test/fkey1.test d65c824459916249bee501532d6154ddab0b5db7
 F test/func.test 5fb6008f8805f8ff1f41cf269cf675aff8923c04
@@ -225,7 +225,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl f9a4c1a12864e129f6717d22313be01d5657e3aa
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 9fb29f7331254b601b71f0fe7d77f91915272dc7
-R 687bc7a5f25dd3652f072255ac9e7494
+P 39a415eaa65964742e40b7ea4d471fa04007c6c9
+R 1f87c66183bcd20f5c4dd0f1294ea301
 U danielk1977
-Z bf8defe1dd292c16a3a6748fcdae004f
+Z a8b87d949b3bcf0bc23b2b09209c47b5

diff --git a/manifest.uuid b/manifest.uuid
index 664568e73a7f05b3cc9a399bb5104fd27edfd7c9..29cd6772ae509579d78f38637dc2ed5d90e27b1a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-39a415eaa65964742e40b7ea4d471fa04007c6c9
\ No newline at end of file
+960f55f3ecbef4581c8cb7be860023ba10de4e96
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 0114aeb47a1a9dbe85214fd2a1b48459464edfbf..d9194a264528a7fc48dbc269bb6f1b522c80ac96 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -23,7 +23,7 @@
 **     ROLLBACK
 **     PRAGMA
 **
-** $Id: build.c,v 1.221 2004/06/18 04:24:54 danielk1977 Exp $
+** $Id: build.c,v 1.222 2004/06/18 06:02:35 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -950,7 +950,7 @@ static void callCollNeeded(sqlite *db, const char *zName, int nName){
   /* No collation sequence of this type for this encoding is registered.
   ** Call the collation factory to see if it can supply us with one.
   */
-  char *zExternal = 0;
+  char const *zExternal = 0;
   assert( !db->xCollNeeded || !db->xCollNeeded16 );
   if( nName<0 ) nName = strlen(zName);
   if( db->xCollNeeded ){

diff --git a/src/os_unix.c b/src/os_unix.c
index c096b6a00e7345698586432d9c6d5588c61f55d9..e2cae01d3e237ff6982d2fb484c9101bce80f376 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -607,11 +607,6 @@ int sqlite3OsSeek(OsFile *id, off_t offset){
 int sqlite3OsSync(OsFile *id){
   SimulateIOError(SQLITE_IOERR);
   TRACE2("SYNC    %-3d\n", id->h);
-{
-off_t sz;
-sqlite3OsFileSize(id, &sz);
-fprintf(stderr,"SYNC %d size=%lld...  ", id->h, sz);
-}
   if( fsync(id->h) ){
     return SQLITE_IOERR;
   }
@@ -621,7 +616,6 @@ fprintf(stderr,"SYNC %d size=%lld...  ", id->h, sz);
     close(id->dirfd);  /* Only need to sync once, so close the directory */
     id->dirfd = -1;    /* when we are done. */
   }
-fprintf(stderr,"DONE\n");
   return SQLITE_OK;
 }
 

diff --git a/src/tokenize.c b/src/tokenize.c
index 7f7e981fdc609b0b7541e41c1fe3cddadba6b179..8600cc6fd069e48ed2532b288644e2298abedcc8 100644 (file)
--- 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.77 2004/06/18 04:24:55 danielk1977 Exp $
+** $Id: tokenize.c,v 1.78 2004/06/18 06:02:35 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -702,7 +702,7 @@ int sqlite3_complete(const char *zSql){
 */
 int sqlite3_complete16(const void *zSql){
   sqlite3_value *pVal;
-  char *zSql8;
+  char const *zSql8;
   int rc = 0;
 
   pVal = sqlite3ValueNew();
@@ -710,7 +710,6 @@ int sqlite3_complete16(const void *zSql){
   zSql8 = sqlite3ValueText(pVal, SQLITE_UTF8);
   if( zSql8 ){
     rc = sqlite3_complete(zSql8);
-    sqliteFree(zSql8);
   }
   sqlite3ValueFree(pVal);
   return rc;

diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index eed4f5a39e844cff67116fc9b6af7dcc673508c7..1e770e48c967b5b2e144025da16b0e9e3005fadb 100644 (file)
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -392,3 +392,4 @@ void sqlite3VdbeMemSanity(Mem*, u8);
 #endif
 int sqlite3VdbeMemTranslate(Mem*, u8);
 void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf, int nBuf);
+int sqlite3VdbeMemHandleBom(Mem *pMem);

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index fde3b1cd25fc3572e298baea5a442405fbfd468a..7ca1e59970095c403b36f38d13f1f107c687b8c6 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -510,7 +510,7 @@ int sqlite3_bind_text16(
 ){
   Vdbe *p = (Vdbe *)pStmt;
   Mem *pVar;
-  int rc, txt_enc;
+  int rc;
 
   rc = vdbeUnbind(p, i);
   if( rc ){

diff --git a/test/enc2.test b/test/enc2.test
index 260018c9d71f71260cb5c4fa8d997dd0dead190c..8c624be7de943bf62ff298dec33e2785576c990a 100644 (file)
--- a/test/enc2.test
+++ b/test/enc2.test
@@ -13,7 +13,7 @@
 # various suported unicode encodings (UTF-8, UTF-16, UTF-16le and
 # UTF-16be).
 #
-# $Id: enc2.test,v 1.10 2004/06/14 08:26:37 danielk1977 Exp $
+# $Id: enc2.test,v 1.11 2004/06/18 06:02:35 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -169,7 +169,6 @@ proc test_collate {enc lhs rhs} {
   set l [lsearch -exact $::values $lhs]
   set r [lsearch -exact $::values $rhs]
   set res [expr $l - $r]
-  # puts "test_collate $enc $lhs $rhs -> $res"
   return $res
 }
 
@@ -195,7 +194,6 @@ do_test enc2-5.2 {
   set res [execsql {SELECT * FROM t5 ORDER BY 1 COLLATE test_collate}]
   lappend res $::test_collate_enc
 } {one two three four five UTF-16LE}
-breakpoint
 do_test enc2-5.3 {
   add_test_collate $DB 0 0 1
   set res [execsql {SELECT * FROM t5 ORDER BY 1 COLLATE test_collate}]
@@ -226,7 +224,6 @@ do_test enc2-5.6 {
   set res [execsql {SELECT * FROM t5 ORDER BY 1 COLLATE test_collate}]
   lappend res $::test_collate_enc
 } {one two three four five UTF-16BE}
-breakpoint
 do_test enc2-5.7 {
   add_test_collate $DB 1 0 0
   set res [execsql {SELECT * FROM t5 ORDER BY 1 COLLATE test_collate}]
@@ -257,7 +254,6 @@ do_test enc2-5.10 {
   set res [execsql {SELECT * FROM t5 ORDER BY 1 COLLATE test_collate}]
   lappend res $::test_collate_enc
 } {one two three four five UTF-16LE}
-breakpoint
 do_test enc2-5.11 {
   add_test_collate $DB 1 0 0
   set res [execsql {SELECT * FROM t5 ORDER BY 1 COLLATE test_collate}]