Fix over-length source code lines in os_unix.c.

FossilOrigin-Name: 7560a9fa50236ecaa0617f1ab5bb5662f4a61c72

diff --git a/manifest b/manifest
index 18ce942edbd66039c96628b4021bd1cadf66b61e..4ab4606db50756c62533a39e83f96fc5e67a53cf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Keep\strack\sof\sthe\soptimal\snumber\sof\sreserved\sbytes\s(by\slooking\sat\sreserve\nbyte\srequests\sin\scalls\sto\ssqlite3BtreeSetPageSize())\sand\sthen\schange\sthe\nreserve\sbyte\scount\sto\sthe\soptimal\swhen\sdoing\sa\sVACUUM\sor\swhen\susing\sthe\nbackup\sAPI.
-D 2015-02-21T00:19:25.084
+C Fix\sover-length\ssource\scode\slines\sin\sos_unix.c.
+D 2015-02-21T00:49:00.792
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -214,7 +214,7 @@ F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
 F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
-F src/os_unix.c 16ad795ef98966d9bdb3c967585fdadf9a2cfcb9
+F src/os_unix.c 77e169d82b1bc679df00a3a59eb8ee2b5547c1a1
 F src/os_win.c 8223e7db5b7c4a81d8b161098ac3959400434cdb
 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c
@@ -1239,7 +1239,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 905009f6723040d4da4776b6fd07e83c628dea2b
-R 9a7352553472f105646c8fe233cf7b38
+P 28c2b726285ea88b334acfd6390a057d2d244838
+R 40164bdb5e6758b7e802bc3a998c4356
 U drh
-Z d63bd336672b94104d11cd96538a1a36
+Z d7418837f1bb2d2284bd9d06bcf9bb52

diff --git a/manifest.uuid b/manifest.uuid
index 67f04903f94683a1666b83fe97fbd90dc44f40af..c117f67f8d69764860cced701695197f0af2070c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-28c2b726285ea88b334acfd6390a057d2d244838
\ No newline at end of file
+7560a9fa50236ecaa0617f1ab5bb5662f4a61c72
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 522617212f66e89f7f0e1d8e9df9accd14387b2b..5f583402ab9aa0a42ee32ee4621358b8529f5409 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -254,7 +254,7 @@ static int randomnessPid = 0;
 #define UNIXFILE_DELETE      0x20     /* Delete on close */
 #define UNIXFILE_URI         0x40     /* Filename might have query parameters */
 #define UNIXFILE_NOLOCK      0x80     /* Do no file locking */
-#define UNIXFILE_WARNED    0x0100     /* verifyDbFile() warnings have been issued */
+#define UNIXFILE_WARNED    0x0100     /* verifyDbFile() warnings issued */
 
 /*
 ** Include code that is common to all os_*.c files
@@ -717,9 +717,9 @@ static int lockTrace(int fd, int op, struct flock *p){
 /*
 ** Retry ftruncate() calls that fail due to EINTR
 **
-** All calls to ftruncate() within this file should be made through this wrapper.
-** On the Android platform, bypassing the logic below could lead to a corrupt
-** database.
+** All calls to ftruncate() within this file should be made through
+** this wrapper.  On the Android platform, bypassing the logic below
+** could lead to a corrupt database.
 */
 static int robust_ftruncate(int h, sqlite3_int64 sz){
   int rc;
@@ -1179,8 +1179,8 @@ static void robust_close(unixFile *pFile, int h, int lineno){
 }
 
 /*
-** Set the pFile->lastErrno.  Do this in a subroutine as that provides a convenient
-** place to set a breakpoint.
+** Set the pFile->lastErrno.  Do this in a subroutine as that provides
+** a convenient place to set a breakpoint.
 */
 static void storeLastErrno(unixFile *pFile, int error){
   pFile->lastErrno = error;
@@ -4969,7 +4969,7 @@ static int unixUnfetch(sqlite3_file *fd, i64 iOff, void *p){
 **   *  An I/O method finder function called FINDER that returns a pointer
 **      to the METHOD object in the previous bullet.
 */
-#define IOMETHODS(FINDER, METHOD, VERSION, CLOSE, LOCK, UNLOCK, CKLOCK, SHMMAP) \
+#define IOMETHODS(FINDER,METHOD,VERSION,CLOSE,LOCK,UNLOCK,CKLOCK,SHMMAP)     \
 static const sqlite3_io_methods METHOD = {                                   \
    VERSION,                    /* iVersion */                                \
    CLOSE,                      /* xClose */                                  \
@@ -6766,7 +6766,7 @@ static int proxyConchLock(unixFile *pFile, uuid_t myHostID, int lockType){
       if( 0==proxyBreakConchLock(pFile, myHostID) ){
         rc = SQLITE_OK;
         if( lockType==EXCLUSIVE_LOCK ){
-          rc = conchFile->pMethod->xLock((sqlite3_file*)conchFile, SHARED_LOCK);          
+          rc = conchFile->pMethod->xLock((sqlite3_file*)conchFile, SHARED_LOCK);
         }
         if( !rc ){
           rc = conchFile->pMethod->xLock((sqlite3_file*)conchFile, lockType);