Fix over-length source code lines in the main.c source file.

FossilOrigin-Name: debba6f161090bf9db1458fb3767d80d8362a73f

diff --git a/manifest b/manifest
index 0fd2ceef536b72201614df83e1f19b9064b34f8e..6d76167d2106c8c8961292d2ccdef010d23c9607 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sso\sthat\sthe\samalgamation\sand\sthe\scommand-line\sshell\sbuild\swithout\nmodifications\son\sVxWorks\s7.\s\sStill\sgives\sa\sfew\scompiler\swarnings,\sand\sstill\nmostly\suntested\son\sthat\splatform.
-D 2015-03-02T22:06:43.573
+C Fix\sover-length\ssource\scode\slines\sin\sthe\smain.c\ssource\sfile.
+D 2015-03-03T14:00:11.869
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f643d6968dfc0b82d2e546a0525a39079f9e928
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -195,7 +195,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
 F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
-F src/main.c 80edeba383aac89f72498b2572a115e21d0ecbbd
+F src/main.c 998d6a92f07d7cf55303031f96c5d666a30eb8a5
 F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@ -1240,7 +1240,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 17890292cf1776b3334fca7eff693cdbea458304
-R d2f100fda951bb397431a320fd5da8c3
+P 7d92f1f11ee69b0ba7d5a48f0611016d77d41c78
+R 29e1839ec3d428ac80725ec179628136
 U drh
-Z 298d458a8c4fd11618e1bcf6179fdf9d
+Z 6030eba2316c60662ec49bc896566222

diff --git a/manifest.uuid b/manifest.uuid
index 98d4babbc9a650983f5fc963847de2fa4b94369b..941f9b8ce5310d5ff91907abdffcf437c71da8eb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7d92f1f11ee69b0ba7d5a48f0611016d77d41c78
\ No newline at end of file
+debba6f161090bf9db1458fb3767d80d8362a73f
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 371bb1fede6c2a07bc7542357df87b84e47a18db..a0bb86a116d185f26f216eb886ac0235cdfa0d60 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -471,7 +471,8 @@ int sqlite3_config(int op, ...){
     case SQLITE_CONFIG_HEAP: {
       /* EVIDENCE-OF: R-19854-42126 There are three arguments to
       ** SQLITE_CONFIG_HEAP: An 8-byte aligned pointer to the memory, the
-      ** number of bytes in the memory buffer, and the minimum allocation size. */
+      ** number of bytes in the memory buffer, and the minimum allocation size.
+      */
       sqlite3GlobalConfig.pHeap = va_arg(ap, void*);
       sqlite3GlobalConfig.nHeap = va_arg(ap, int);
       sqlite3GlobalConfig.mnReq = va_arg(ap, int);
@@ -576,7 +577,9 @@ int sqlite3_config(int op, ...){
       ** compile-time maximum mmap size set by the SQLITE_MAX_MMAP_SIZE
       ** compile-time option.
       */
-      if( mxMmap<0 || mxMmap>SQLITE_MAX_MMAP_SIZE ) mxMmap = SQLITE_MAX_MMAP_SIZE;
+      if( mxMmap<0 || mxMmap>SQLITE_MAX_MMAP_SIZE ){
+        mxMmap = SQLITE_MAX_MMAP_SIZE;
+      }
       if( szMmap<0 ) szMmap = SQLITE_DEFAULT_MMAP_SIZE;
       if( szMmap>mxMmap) szMmap = mxMmap;
       sqlite3GlobalConfig.mxMmap = mxMmap;
@@ -2863,7 +2866,8 @@ static int openDatabase(
 opendb_out:
   sqlite3_free(zOpen);
   if( db ){
-    assert( db->mutex!=0 || isThreadsafe==0 || sqlite3GlobalConfig.bFullMutex==0 );
+    assert( db->mutex!=0 || isThreadsafe==0
+           || sqlite3GlobalConfig.bFullMutex==0 );
     sqlite3_mutex_leave(db->mutex);
   }
   rc = sqlite3_errcode(db);
@@ -3608,7 +3612,7 @@ int sqlite3_test_control(int op, ...){
       break;
     }
 
-    /*   sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, db, dbName, onOff, tnum);
+    /*  sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, db, dbName, onOff, tnum);
     **
     ** This test control is used to create imposter tables.  "db" is a pointer
     ** to the database connection.  dbName is the database name (ex: "main" or
@@ -3617,8 +3621,8 @@ int sqlite3_test_control(int op, ...){
     ** table should connect.
     **
     ** Enable imposter mode only when the schema has already been parsed.  Then
-    ** run a single CREATE TABLE statement to construct the imposter table in the
-    ** parsed schema.  Then turn imposter mode back off again.
+    ** run a single CREATE TABLE statement to construct the imposter table in
+    ** the parsed schema.  Then turn imposter mode back off again.
     **
     ** If onOff==0 and tnum>0 then reset the schema for all databases, causing
     ** the schema to be reparsed the next time it is needed.  This has the