From: mistachkin <mistachkin@noemail.net>
Date: Wed, 17 Jun 2015 18:57:37 +0000 (+0000)
Subject: Improve spacing and comment style for the shell.  No changes to code.
X-Git-Tag: version-3.8.11~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=073664de88b6ab42a5f9d99b88a01fb9662ff321;p=thirdparty%2Fsqlite.git

Improve spacing and comment style for the shell.  No changes to code.

FossilOrigin-Name: 5b547da00d131a494a6b348339af3d91dfa6e3b6
---

diff --git a/manifest b/manifest
index c4288ba45b..5bc880ee3d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\scomments\son\sthe\sfuzzcheck.c\stest\sprogram.\s\sNo\schanges\sto\scode.
-D 2015-06-17T18:24:40.654
+C Improve\sspacing\sand\scomment\sstyle\sfor\sthe\sshell.\s\sNo\schanges\sto\scode.
+D 2015-06-17T18:57:37.637
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -251,7 +251,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c 84c571794e3ee5806274d95158a4c0177c6c4708
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c 45a814a755f90c1a6345164d2da4a8ef293da53d
-F src/shell.c 69c9ca4dba7a33dc70a1bc46ee3ddd70449e969a
+F src/shell.c 8af3cced094aebb5f57a8ad739b9dafc7867eed7
 F src/sqlite.h.in 76d2f5637eb795b6300d9dd3c3ec3632ffafd721
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h be1a718b7d2ce40ceba725ae92c8eb5f18003066
@@ -1286,7 +1286,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P fc4f4d1eccec2e09b5d2e6c4da082204f4d5a016
-R c899e9b20cb2a89272908946dedc2b9a
-U drh
-Z 2e60edd59a1d27a41fd4904a20b823dc
+P a7e27d19280048bcfff6d2e796eed72287b9dabe
+R 10ec64cfc3a208bfe24294966a7ab6ac
+U mistachkin
+Z 7cf2fc34937c3a0e66c014198502d58b
diff --git a/manifest.uuid b/manifest.uuid
index d97621c54a..27a46f6c68 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a7e27d19280048bcfff6d2e796eed72287b9dabe
\ No newline at end of file
+5b547da00d131a494a6b348339af3d91dfa6e3b6
\ No newline at end of file
diff --git a/src/shell.c b/src/shell.c
index ef3f73d38a..d097e913a3 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -101,28 +101,26 @@
 #if defined(_WIN32) || defined(WIN32)
 # include <io.h>
 # include <fcntl.h>
-#define isatty(h) _isatty(h)
-#ifndef access
-# define access(f,m) _access((f),(m))
-#endif
-#undef popen
-#define popen _popen
-#undef pclose
-#define pclose _pclose
-#else
-/* Make sure isatty() has a prototype.
-*/
-extern int isatty(int);
-
-#if !defined(__RTP__) && !defined(_WRS_KERNEL)
-  /* popen and pclose are not C89 functions and so are sometimes omitted from
-  ** the <stdio.h> header */
-  extern FILE *popen(const char*,const char*);
-  extern int pclose(FILE*);
+# define isatty(h) _isatty(h)
+# ifndef access
+#  define access(f,m) _access((f),(m))
+# endif
+# undef popen
+# define popen _popen
+# undef pclose
+# define pclose _pclose
 #else
-# define SQLITE_OMIT_POPEN 1
-#endif
+ /* Make sure isatty() has a prototype. */
+ extern int isatty(int);
 
+# if !defined(__RTP__) && !defined(_WRS_KERNEL)
+  /* popen and pclose are not C89 functions and so are
+  ** sometimes omitted from the <stdio.h> header */
+   extern FILE *popen(const char*,const char*);
+   extern int pclose(FILE*);
+# else
+#  define SQLITE_OMIT_POPEN 1
+# endif
 #endif
 
 #if defined(_WIN32_WCE)