Fix a harmless "scan-build" compiler warning in the command-line shell.

FossilOrigin-Name: 39fafe0a19ff346a2354f00b03f8e8e4b8b0524c

diff --git a/manifest b/manifest
index df06f52983d48c54fbb8ce0372d1875d3e49c557..19a562db3c9cc7af57038d764a471f29cdca0dd3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scompile\sof\sharmless\sstatic\sanalyzer\swarnings.
-D 2014-05-31T15:39:53.464
+C Fix\sa\sharmless\s"scan-build"\scompiler\swarning\sin\sthe\scommand-line\sshell.
+D 2014-05-31T15:43:33.950
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -221,7 +221,7 @@ F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
 F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 F src/select.c 7df17ec5506c2427576d412bee0e6ea740e12563
-F src/shell.c d4ec3e1473501e78f39627787c8d356c0f5452d1
+F src/shell.c 98ce7f52445aa0c2eac3d4553a4cdcbb6402a670
 F src/sqlite.h.in a98eb3e8c86c934ea6f5bcfc6b69653dde2f4ed4
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
@@ -1173,7 +1173,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P a4df4a5b34111f755ffd9ee6f089ff05d03ebc7a
-R 2d19a2ada3f5fefd918cda5ebc3435ec
+P 7e287f2055dcd82c92d1711aec97cb6552a354bb
+R 7e70d3d08723eec61780bac69ffa27e8
 U drh
-Z 8c6dc131bc227333f4313c945c3b7bef
+Z 0b7f4da5b5f8e964f7f7fb0aa6199d46

diff --git a/manifest.uuid b/manifest.uuid
index 989543cb0b79e202b0c844d429858b74c30fc6c0..a35a2086faa65f7c5e20370a3e2a68443ddcebc6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7e287f2055dcd82c92d1711aec97cb6552a354bb
\ No newline at end of file
+39fafe0a19ff346a2354f00b03f8e8e4b8b0524c
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 526ddbbdeccdf266b90418e84650ab862cef0ecb..1f8681f63950d2e0141c0f894293aadc0fd96f07 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -2425,8 +2425,8 @@ static int do_meta_command(char *zLine, struct callback_data *p){
   }else
 
   if( c=='i' && strncmp(azArg[0], "import", n)==0 ){
-    char *zTable = azArg[2];    /* Insert data into this table */
-    char *zFile = azArg[1];     /* Name of file to extra content from */
+    char *zTable;               /* Insert data into this table */
+    char *zFile;                /* Name of file to extra content from */
     sqlite3_stmt *pStmt = NULL; /* A statement */
     int nCol;                   /* Number of columns in the table */
     int nByte;                  /* Number of bytes in an SQL string */
@@ -2441,6 +2441,8 @@ static int do_meta_command(char *zLine, struct callback_data *p){
       fprintf(stderr, "Usage: .import FILE TABLE\n");
       goto meta_command_exit;
     }
+    zFile = azArg[1];
+    zTable = azArg[2];
     seenInterrupt = 0;
     memset(&sCsv, 0, sizeof(sCsv));
     open_db(p, 0);