From: pweilbacher Date: Wed, 26 Nov 2008 20:03:21 +0000 (+0000) Subject: remove warning in os2Sync() with SQLITE_NO_SYNC set (CVS 5962) X-Git-Tag: version-3.6.10~222 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d102d1134b2f008d4edb877688d75ef19c7a92c8;p=thirdparty%2Fsqlite.git remove warning in os2Sync() with SQLITE_NO_SYNC set (CVS 5962) FossilOrigin-Name: 68a51f67afd54f1c423206a92b36a33af071d5e1 --- diff --git a/manifest b/manifest index 1e173e9242..4b788d82e5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C make\sos2Randomness()\sact\sthe\ssame\sas\sother\splatforms\swith\sSQLITE_TEST\s(all\szeroed\sbuffer)\s(CVS\s5961) -D 2008-11-26T19:56:48 +C remove\swarning\sin\sos2Sync()\swith\sSQLITE_NO_SYNC\sset\s(CVS\s5962) +D 2008-11-26T20:03:21 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 0aa7bbe3be6acc4045706e3bb3fd0b8f38f4a3b5 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -136,7 +136,7 @@ F src/mutex_w32.c 017b522f63ef09b834fefc9daa876c9ec167e7b5 F src/os.c 0b411644b87ad689d7250bbfd1834d99b81a3df4 F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60 -F src/os_os2.c 527d5fc81f4bb271dc410ecea82a43c14e57a4c3 +F src/os_os2.c 36196e71292a44bf2d393413cd8c86199694b8b4 F src/os_unix.c add9937ac646b0f5f8dd603053ceb9264d675a60 F src/os_win.c 3dff41670fb9798a869c636626bb7d6d8b6a45bb F src/pager.c 2e9182e181bbd3d758436d9ccce2a3910400dd30 @@ -662,7 +662,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 4e94aa3bedc6dba003a2a4ecbba9c11c465eab4f -R 708297e3fd6f935231eadef6a57f7f9e +P 5d189df39a3a5e99372826f87f9f20bbd92f1565 +R a35eb4838c3934f518a47b17da819c1f U pweilbacher -Z c8df22875f69e8165126ebc6cca03ad6 +Z 32745e619cafb1103855e269ae925c0e diff --git a/manifest.uuid b/manifest.uuid index 62a0ba413f..5fba0aa118 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5d189df39a3a5e99372826f87f9f20bbd92f1565 \ No newline at end of file +68a51f67afd54f1c423206a92b36a33af071d5e1 \ No newline at end of file diff --git a/src/os_os2.c b/src/os_os2.c index fb175e8c9e..8bcdb8c0b3 100644 --- a/src/os_os2.c +++ b/src/os_os2.c @@ -12,7 +12,7 @@ ** ** This file contains code that is specific to OS/2. ** -** $Id: os_os2.c,v 1.61 2008/11/26 19:56:48 pweilbacher Exp $ +** $Id: os_os2.c,v 1.62 2008/11/26 20:03:21 pweilbacher Exp $ */ #include "sqliteInt.h" @@ -200,6 +200,7 @@ static int os2Sync( sqlite3_file *id, int flags ){ ** no-op */ #ifdef SQLITE_NO_SYNC + UNUSED_PARAMETER(pFile); return SQLITE_OK; #else return DosResetBuffer( pFile->h ) == NO_ERROR ? SQLITE_OK : SQLITE_IOERR;