From: dan <dan@noemail.net>
Date: Fri, 2 Jul 2010 16:36:18 +0000 (+0000)
Subject: Add initializers for the xShmXXX() members to an sqlite3_io_methods structure in... 
X-Git-Tag: version-3.7.2~204
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=230fd98dd3f127d7d2fbb8fdd85f002a824cece0;p=thirdparty%2Fsqlite.git

Add initializers for the xShmXXX() members to an sqlite3_io_methods structure in journal.c. This doesn't fix any real problem, just prevents a compiler warning.

FossilOrigin-Name: dafb3577a2d5fbeebb17c8176af837f0aebf6ee5
---

diff --git a/manifest b/manifest
index e05ad1fe67..eb168f7314 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Remove\san\sunused\scall\sto\ssqlite3PageBegin()\sfrom\spager_write().\s\sReplace\sit\nwith\san\sassert().
-D 2010-07-02T15:35:58
+C Add\sinitializers\sfor\sthe\sxShmXXX()\smembers\sto\san\ssqlite3_io_methods\sstructure\sin\sjournal.c.\sThis\sdoesn't\sfix\sany\sreal\sproblem,\sjust\sprevents\sa\scompiler\swarning.
+D 2010-07-02T16:36:18
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -134,7 +131,7 @@ F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
 F src/insert.c d9476f23f85a20eea3cc25a4b9f9cbae77a33bf2
-F src/journal.c b0ea6b70b532961118ab70301c00a33089f9315c
+F src/journal.c cb9f12b6734a0b25aa60d3e093a27bccf46b4bc6
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
 F src/loadext.c 1c7a61ce1281041f437333f366a96aa0d29bb581
@@ -833,14 +830,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P c6714b0dbdc782e721662ec166d9f161bc05c6df
-R 6b061c34f328178e14495dbe8bda105d
-U drh
-Z 1d4426dd5a36bf8b9496de70daa3941f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFMLgdhoxKgR168RlERAgrFAJ9BcfJJE41g0R/wTWwcLA+eHswnvACfZcVS
-nrB2I8DZXgACDKC9GqC0AnY=
-=LU4G
------END PGP SIGNATURE-----
+P 01c1278263fdd8454763be15bddd2558e720e6e0
+R f945708978bd6e2d6ef2b7036668ceb3
+U dan
+Z 365ea1ba861987a397d4382540eb2770
diff --git a/manifest.uuid b/manifest.uuid
index a8efe90114..383e7207c3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-01c1278263fdd8454763be15bddd2558e720e6e0
\ No newline at end of file
+dafb3577a2d5fbeebb17c8176af837f0aebf6ee5
\ No newline at end of file
diff --git a/src/journal.c b/src/journal.c
index 2a806e354f..eb01930edd 100644
--- a/src/journal.c
+++ b/src/journal.c
@@ -182,7 +182,12 @@ static struct sqlite3_io_methods JournalFileMethods = {
   0,             /* xCheckReservedLock */
   0,             /* xFileControl */
   0,             /* xSectorSize */
-  0              /* xDeviceCharacteristics */
+  0,             /* xDeviceCharacteristics */
+  0,             /* xShmOpen */
+  0,             /* xShmLock */
+  0,             /* xShmMap */
+  0,             /* xShmBarrier */
+  0              /* xShmClose */
 };
 
 /*