Fix MSVC compiler warning in vdbeaux.c. (CVS 6485)

FossilOrigin-Name: d619465e31c2366b389fea6ee2ce6b1806738a0f

diff --git a/manifest b/manifest
index 7ecb8998c62f83b0ddfb99520a872479608618c7..01e99197f52c8dcaf9196c86be1e50d8490d35db 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sthe\sselect1-15\stests\swhen\slocking_mode\sis\sEXCLUSIVE.\s\sTicket\s#3771.\s(CVS\s6484)
-D 2009-04-10T15:38:43
+C Fix\sMSVC\scompiler\swarning\sin\svdbeaux.c.\s(CVS\s6485)
+D 2009-04-10T15:42:36
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -204,7 +204,7 @@ F src/vdbe.c 88bc70921ccdcff8bfdf574f3e2285d17ab97103
 F src/vdbe.h 35a648bc3279a120da24f34d9a25213ec15daf8a
 F src/vdbeInt.h df5c5a1c739c98af2c83440dde3fc361240f3a25
 F src/vdbeapi.c d3c6f28dbf462187f3fd696f2357e0d23940abac
-F src/vdbeaux.c b48b0af5acd527ffe31a6da4f61971f7bd0bec0b
+F src/vdbeaux.c 5ecb4c7a041b8926a8927b1a27bcbb8ff74ae5c4
 F src/vdbeblob.c e67757450ae8581a8b354d9d7e467e41502dfe38
 F src/vdbemem.c 9798905787baae83d0b53b62030e32ecf7a0586f
 F src/vtab.c f1aba5a6dc1f83b97a39fbbc58ff8cbc76311347
@@ -717,7 +717,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P c31d4359ae056dca9e9de61ef8ceb683b92850e7
-R 2f7d2faa97bf63d1e1c8bdd54d4e1b59
-U drh
-Z f1d1f71c2dd9506a6b873860f856672a
+P 88cefbb4a12ab7037f025141ddbe041ea82a6c61
+R 7cd555ff696513b7fef9e34133f4d3b1
+U shane
+Z aa7c26992e02cec3c1ad9dee8fa0d36f

diff --git a/manifest.uuid b/manifest.uuid
index 5b6aa61ca98a78bb7bff18e1662359f7f4d1b4cb..94a23ee67a1e6f97160a222e57c256a278fafd50 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-88cefbb4a12ab7037f025141ddbe041ea82a6c61
\ No newline at end of file
+d619465e31c2366b389fea6ee2ce6b1806738a0f
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 1b741a0a46b54d14efd0ad86ae9eb942e091eec5..8f67eef7309c3ff9ff1d1b4797edb8da0924db5e 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -14,7 +14,7 @@
 ** to version 2.8.7, all this code was combined into the vdbe.c source file.
 ** But that file was getting too big so this subroutines were split out.
 **
-** $Id: vdbeaux.c,v 1.450 2009/04/10 12:55:17 danielk1977 Exp $
+** $Id: vdbeaux.c,v 1.451 2009/04/10 15:42:36 shane Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -2360,7 +2360,12 @@ UnpackedRecord *sqlite3VdbeRecordUnpack(
   Mem *pMem;
   int nOff;           /* Increase pSpace by this much to 8-byte align it */
   
-  nOff = (8 - ((pSpace - (char*)0)&7)) & 7;
+  /*
+  ** We want to shift the pointer pSpace up such that it is 8-byte aligned.
+  ** Thus, we need to calculate a value, nOff, between 0 and 7, to shift 
+  ** it by.  If pSpace is already 8-byte aligned, nOff should be zero.
+  */
+  nOff = (8 - (SQLITE_PTR_TO_INT(pSpace) & 7)) & 7;
   pSpace += nOff;
   szSpace -= nOff;
   nByte = ROUND8(sizeof(UnpackedRecord)) + sizeof(Mem)*(pKeyInfo->nField+1);