Improvements to the formatting and layout of the code in the previous checkin. (CVS...

FossilOrigin-Name: 73b430de0c0f3cd230861fc1a53691818f17de0d

diff --git a/manifest b/manifest
index 8c2f83483681aaf14ae470adad1f9401d51ce1b2..8989268f83717b43baea5fe4686323fa0913bfcf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\san\sassert\sto\sverify\sthat\sfloating\spoint\svalues\sand\sintegers\suse\sthe\nsame\sbyte\sorder.\s\sAdd\sa\scomment\sto\sthe\sSELECT\scode\sgenerator.\s(CVS\s2635)
-D 2005-08-28T01:34:22
+C Improvements\sto\sthe\sformatting\sand\slayout\sof\sthe\scode\sin\sthe\sprevious\scheckin.\s(CVS\s2636)
+D 2005-08-28T01:38:44
 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -84,7 +84,7 @@ F src/vdbe.c 69f33e22c7d0a64b23fbb69e6da95a1bb6869032
 F src/vdbe.h 3b29a9af6c7a64ed692bef1fc5f61338f40d2f67
 F src/vdbeInt.h 89a7fa5dc35477bd30ea27b0bf38e9e5c2903812
 F src/vdbeapi.c f1adebb5e3fe4724ed0e1a82c4a61809d7e15e9e
-F src/vdbeaux.c bbed7e89b6efaa6fdd81d1bbb72a1c4834d8c198
+F src/vdbeaux.c 192e0dbeaaa0bfa652b0c2579c19894e5e5626fc
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 4732fd4d1a75dc38549493d7f9a81d02bf7c59b5
 F src/where.c 485041aa51fb33f43b346e018f7c01422847f364
@@ -299,7 +299,7 @@ F www/tclsqlite.tcl 3df553505b6efcad08f91e9b975deb2e6c9bb955
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P b2415a749ca5352e5bb4ad08df0c947ec8b02d18
-R 5339976d2615e276ce68459b7c71258d
+P 07b4892149a436dbd904c781b46e3b9a82a7a744
+R 56bce97242dc7452e7c0c82a7290a18f
 U drh
-Z 9a98b7343aacdaafe59eae7e941aec3f
+Z c5016f965428049b0b8ec32bf981d8fb

diff --git a/manifest.uuid b/manifest.uuid
index 2517d3ad15b2c8325829406a7cf3bb9ee6d40b4e..9e582500ed2471d7a68ce412530804d751f9185e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-07b4892149a436dbd904c781b46e3b9a82a7a744
\ No newline at end of file
+73b430de0c0f3cd230861fc1a53691818f17de0d
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 41a2a0c519d59d0619cd271674a982efb530c005..a14f55ea9abf269b4c7f10c0fa47b175f49ebb3a 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1714,14 +1714,16 @@ int sqlite3VdbeSerialGet(
     }
     case 6:   /* 8-byte signed integer */
     case 7: { /* IEEE floating point */
-      u64 x = (buf[0]<<24) | (buf[1]<<16) | (buf[2]<<8) | buf[3];
-      u32 y = (buf[4]<<24) | (buf[5]<<16) | (buf[6]<<8) | buf[7];
 #ifndef NDEBUG
       /* Verify that integers and floating point values use the same
-      ** byte order.  The byte order differs on some (broken) architectures. */
+      ** byte order.  The byte order differs on some (broken) architectures.
+      */
       static const u64 t1 = ((u64)0x3ff00000)<<32;
       assert( 1.0==*(double*)&t1 );
 #endif
+
+      u64 x = (buf[0]<<24) | (buf[1]<<16) | (buf[2]<<8) | buf[3];
+      u32 y = (buf[4]<<24) | (buf[5]<<16) | (buf[6]<<8) | buf[7];
       x = (x<<32) | y;
       if( serial_type==6 ){
         pMem->i = *(i64*)&x;