From: drh <drh@noemail.net>
Date: Wed, 7 Oct 2009 23:42:25 +0000 (+0000)
Subject: Use memcpy() rather than structure assignment so that memcmp() can later
X-Git-Tag: fts3-refactor~121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b5db1dbd669dd83a8ea0e3d449827f185fda6a2;p=thirdparty%2Fsqlite.git

Use memcpy() rather than structure assignment so that memcmp() can later
be used for comparison.  Ticket [8550ecca70]

FossilOrigin-Name: 56f609da4bfcc794e1f8573652dcde8515e87098
---

diff --git a/manifest b/manifest
index 5707cc2345..9f8c3801f4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Add\ssome\stests\sof\sstatements\sin\sforeignkeys.html.
-D 2009-10-07T18:41:20
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Use\smemcpy()\srather\sthan\sstructure\sassignment\sso\sthat\smemcmp()\scan\slater\nbe\sused\sfor\scomparison.\s\sTicket\s[8550ecca70]
+D 2009-10-07T23:42:25
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4ca3f1dd6efa2075bcb27f4dc43eef749877740d
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -146,7 +149,7 @@ F src/os.c 8d62d8d98ad7909cb0dd294c1e5f3835c887ccb6
 F src/os.h 00a1334a4eecee7f7bef79ac606b88d325119f21
 F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
-F src/os_unix.c 5369272992c14dd198c02ddfc2fd7a1516906c40
+F src/os_unix.c 5686c0e4f0aa2c93b43b66c563ea1d5b80cd4b9b
 F src/os_win.c 49a360be4f42d5a63d00be9aa44449ed4d6717e0
 F src/pager.c ebd0a8f2421e8f0ad5b78201440004bf3e1c96d8
 F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f
@@ -756,7 +759,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 5caa4a2b050d5743b1407485cf419aa36cf16ac6
-R 6e2bec7f14be2bc8a2ff167508eb9921
-U dan
-Z 1105fea50b7c6c07e7cbb16d59bd372a
+P 8382867956caf20f62c46c15b456c1c16d0824fd
+R 76290e80d2ef239d10246f9e34af4d36
+U drh
+Z d96d85ec5a13c4dfed62c2912ddfa322
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFKzSdkoxKgR168RlERAowDAJ9VuPryqdkaiwm7YRYx4tkcIMQvVwCeJoxP
+LLx2jj4PZfCPTBeUDNrUzUA=
+=7Fog
+-----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index f90eda0a20..8650179b64 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8382867956caf20f62c46c15b456c1c16d0824fd
\ No newline at end of file
+56f609da4bfcc794e1f8573652dcde8515e87098
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index ef04a72e45..37447ac402 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1028,7 +1028,7 @@ static int findLockInfo(
         rc = SQLITE_NOMEM;
         goto exit_findlockinfo;
       }
-      pLock->lockKey = lockKey;
+      memcpy(&pLock->lockKey,&lockKey,sizeof(lockKey));
       pLock->nRef = 1;
       pLock->cnt = 0;
       pLock->locktype = 0;