From: dan <dan@noemail.net>
Date: Mon, 24 Aug 2009 18:57:58 +0000 (+0000)
Subject: Fix some errors in [http://www.sqlite.org/src/vdiff/aa6acfa8caa2ef59b4c16dfe42c4b5644... 
X-Git-Tag: fts3-refactor~231
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6aa657f76b78c432111ec51e4f6cba195523c7f0;p=thirdparty%2Fsqlite.git

Fix some errors in [http://www.sqlite.org/src/vdiff/aa6acfa8caa2ef59b4c16dfe42c4b5644da96905|aa6acfa8ca].

FossilOrigin-Name: 82d1934a428a34c292a612fb67bbcea262990e0f
---

diff --git a/manifest b/manifest
index eb0a645e7f..cf8141d34c 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Remove\san\sobsolete\sdocumentation\sfile\sleft\sover\sfrom\sSQLite\sversion\s1.0.
-D 2009-08-22T19:17:03
+C Fix\ssome\serrors\sin\s[http://www.sqlite.org/src/vdiff/aa6acfa8caa2ef59b4c16dfe42c4b5644da96905|aa6acfa8ca].
+D 2009-08-24T18:57:58
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 73ddeec9dd10b85876c5c2ce1fdce627e1dcc7f8
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -147,7 +144,7 @@ F src/os.c 9fea283e336ee31caa4654d6cb05a129a1c42d2f
 F src/os.h 00a1334a4eecee7f7bef79ac606b88d325119f21
 F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
-F src/os_unix.c f151f27d353bf4240896d9a1386e5d59102a3cba
+F src/os_unix.c 5fc8443b16d64faf3db374f6dda959cfe3202a03
 F src/os_win.c 58bb163f327e79726dd119344d908e4d98483c3f
 F src/pager.c a47be286477ed6c7b9a342dd53d4e4043f29d8c2
 F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f
@@ -750,14 +747,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P aa6acfa8caa2ef59b4c16dfe42c4b5644da96905
-R b2c711eaf557092f239dfa0773f260fa
-U drh
-Z 691b8bbbc5705e9c8f90c29fb0305de2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFKkEQyoxKgR168RlERAiJ9AJsFs50VJ3XZxahfq30lhOA5nWayXACfW1Th
-dnkRj6C5BnZxRcqkd+dsDMQ=
-=jBN8
------END PGP SIGNATURE-----
+P f7eb1efc37d0658d66b3b86d5afd5419d22bfe92
+R 83c4813ff710350c0fba94b0a5e87768
+U dan
+Z 0b89a0ea45e445bcb467bd70aa77089d
diff --git a/manifest.uuid b/manifest.uuid
index 3696961cee..2fbcc968e9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f7eb1efc37d0658d66b3b86d5afd5419d22bfe92
\ No newline at end of file
+82d1934a428a34c292a612fb67bbcea262990e0f
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 99312604ad..65259a7568 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1428,7 +1428,6 @@ static int closePendingFds(unixFile *pFile){
       rc = SQLITE_IOERR_CLOSE;
       p->pNext = pError;
       pError = p;
-      assert(0);
     }else{
       sqlite3_free(p);
     }
@@ -2609,7 +2608,7 @@ static int afpUnlock(sqlite3_file *id, int locktype) {
       struct unixOpenCnt *pOpen = pFile->pOpen;
       pOpen->nLock--;
       assert( pOpen->nLock>=0 );
-      if( pOpen->nLock==0 && pOpen->nPending>0 ){
+      if( pOpen->nLock==0 ){
         rc = closePendingFds(pFile);
       }
     }
@@ -3817,7 +3816,7 @@ static int unixOpen(
     if( pUnused ){
       fd = pUnused->fd;
     }else{
-      pUnused = sqlite3_malloc(sizeof(pUnused));
+      pUnused = sqlite3_malloc(sizeof(*pUnused));
       if( !pUnused ){
         return SQLITE_NOMEM;
       }