Fix a compiler warning in shell.c. Updates to comments in trigger.c.

FossilOrigin-Name: c727601eecd85a26dbd4fc36823d77bec34da3c3

diff --git a/manifest b/manifest
index 86c08d180cc96e1c43a9f72a1053c43fcf9c238a..7c46ac417792c87d8764f029be72ef056e81446b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Fix\sa\stypo\sin\sthe\sdocumentation\sfor\sthe\sOP_OpenPseudo\sopcode.
-D 2010-02-15T15:17:06
+C Fix\sa\scompiler\swarning\sin\sshell.c.\s\sUpdates\sto\scomments\sin\strigger.c.
+D 2010-02-15T15:47:18
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -166,7 +166,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 56ecd50851afa9dbcc1803ef86a9b17b3f3d3b89
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c 0109b993c360d649857523abb72919e1794f9b45
-F src/shell.c d7408dbe4d17fbefc0e63e85f6498634962922f9
+F src/shell.c 56521a172567f5f9f59f528599bf63380e150ac4
 F src/sqlite.h.in 2afdca943d145f84f55468b1ab608df0d719c318
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
 F src/sqliteInt.h a1df33a2c9a0c5062088b655ddf10237f1bcef2f
@@ -207,7 +207,7 @@ F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
 F src/test_thread.c 00fed80690ae7f1525483a35861511c48bc579f2
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/tokenize.c e7f3606cc1b51a819a2bfee99100648d35bc791d
-F src/trigger.c d46f9389e3bf3dd1cc1d288aba2f289c96b34200
+F src/trigger.c a188f616acd9092231068c841e15cb531ff2bc0d
 F src/update.c c0dc6b75ad28b76b619042d934f337b02acee208
 F src/utf.c dad16adcc0c35ef2437dca125a4b07419d361052
 F src/util.c aa0b1da8f71edff84b4b41dbe05fe6ac75d819c6
@@ -790,14 +790,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 942aa1f6a91655356cc32a8185cb447331d405dc
-R 96ed7c8828d98879cc72ca6f67e06ea7
+P 9acfb0694059c80b2efc08a60232d4be91575c32
+R f3f1e356ae050092c353da0201c436cd
 U drh
-Z b17df2ad7162be0be25a28fbf6e0b8be
+Z 5a688a63ea61023caa210ca9d98db903
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLeWV1oxKgR168RlERAkXLAKCKwAiZiL6LVwUZ5Xo7V1gh47mmNQCdGXl+
-hNkVcTOcCExujWunCRv/xwU=
-=LcuG
+iD8DBQFLeWyJoxKgR168RlERAltLAJ9EhYGSB7HNvlpLXs8n7ZXBinUlkACfUxu8
+32nUfmidvypW0Im8sUgkg7U=
+=aFCH
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 400e4283b36a77a36619096922dafaea18ed2822..924897296c0eb1ddfe5229d6b27de032f531492a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9acfb0694059c80b2efc08a60232d4be91575c32
\ No newline at end of file
+c727601eecd85a26dbd4fc36823d77bec34da3c3
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index af56792ecd42d79b507482db5df56bbf5015df42..5f912f4306364e37afacdaa745f0e2f91f873dc1 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -1853,9 +1853,9 @@ static int shell_exec(
 
       /* echo the sql statement if echo on */
       if( pArg->echoOn ){
-        char *zStmtSql = sqlite3_sql(pStmt);\r
+        const char *zStmtSql = sqlite3_sql(pStmt);
         fprintf(pArg->out,"%s\n", zStmtSql ? zStmtSql : zSql);
-      }\r
+      }
 
       /* perform the first step.  this will tell us if we
       ** have a result set or not and how wide it is.

diff --git a/src/trigger.c b/src/trigger.c
index 51969ce2303e3a36f3217e344122b67f7d62d06d..642833cb1482cc3d15354f983b4f90dc03931fcf 100644 (file)
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -254,12 +254,12 @@ void sqlite3FinishTrigger(
   TriggerStep *pStepList, /* The triggered program */
   Token *pAll             /* Token that describes the complete CREATE TRIGGER */
 ){
-  Trigger *pTrig = pParse->pNewTrigger;    /* Trigger being finished */
-  char *zName;                             /* Name of trigger */
-  sqlite3 *db = pParse->db;                /* The database */
-  DbFixer sFix;
-  int iDb;                                 /* Database containing the trigger */
-  Token nameToken;           /* Trigger name for error reporting */
+  Trigger *pTrig = pParse->pNewTrigger;   /* Trigger being finished */
+  char *zName;                            /* Name of trigger */
+  sqlite3 *db = pParse->db;               /* The database */
+  DbFixer sFix;                           /* Fixer object */
+  int iDb;                                /* Database containing the trigger */
+  Token nameToken;                        /* Trigger name for error reporting */
 
   pTrig = pParse->pNewTrigger;
   pParse->pNewTrigger = 0;
@@ -278,7 +278,7 @@ void sqlite3FinishTrigger(
     goto triggerfinish_cleanup;
   }
 
-  /* if we are not initializing, and this trigger is not on a TEMP table, 
+  /* if we are not initializing,
   ** build the sqlite_master entry
   */
   if( !db->init.busy ){