When SQLITE_OMIT_FLOATING_POINT is defined, the floating-point formats in

the sqlite3_*printf() functions should pull an int64 off of the parameter
list and ignore it.

FossilOrigin-Name: 3fd6f9ad06b786116ca18c1e812363d30cd3060e

diff --git a/manifest b/manifest
index 0d6fa15ff4ab4767d5abac2ad9e683fd18daba16..aee39911843da508794fc378342e643adbcfd351 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C When\sSQLITE_OMIT_FLOATING_POINT\sis\sdefined,\smake\ssure\sthe\sresult\sof\sa\nmathematical\soperation\sis\salways\stagged\sas\san\sinteger.
-D 2010-01-13T16:25:43
+C When\sSQLITE_OMIT_FLOATING_POINT\sis\sdefined,\sthe\sfloating-point\sformats\sin\nthe\ssqlite3_*printf()\sfunctions\sshould\spull\san\sint64\soff\sof\sthe\sparameter\nlist\sand\signore\sit.
+D 2010-01-13T16:43:27
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -161,7 +161,7 @@ F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
 F src/pcache1.c 2bb2261190b42a348038f5b1c285c8cef415fcc8
 F src/pragma.c 6936d7df5e04b9f996f8f320d15e65b6944b2caa
 F src/prepare.c d4cd38ccfb51f1424d0e61d4878a810b7e1ebb60
-F src/printf.c 644bc7d59df3dc56d6d8b9a510914bfc6b51bc69
+F src/printf.c 2c2702dc4955394dae554b7c45f45656eb42de7f
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 56ecd50851afa9dbcc1803ef86a9b17b3f3d3b89
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
@@ -788,14 +788,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 417167182efaa1da74008952137de3e00c23494e
-R 89c89c924af8f7e6db6160c5a29903bd
+P e12da0d316fcc34a75554d59fe6d11d9f0e059e2
+R 356750da68b38dd3fbb8aa2463323a2a
 U drh
-Z 5f39bd0fb79ec5cb4191d06b8944929f
+Z 14a6655f5ff26845eed059d637c77f11
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLTfQKoxKgR168RlERAk5yAJ4yqYP9RAXAemmavFjE3kclxjaO+QCfRZjo
-9QCR6Br/2vxhKD2xDVbkDcI=
-=hlG7
+iD8DBQFLTfgyoxKgR168RlERAmWDAJ4zLspJTSZ3W3wpJCaE/S/Z2HpGngCfSqgd
+KuQNVs6DYPwCohTNe8i0Qlg=
+=9gOo
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 07f50d9acf6fae15bd97774f2b94fa91c222ec63..7d0822ced47ecdfb7e72b4c19ba3f0134cb9c283 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e12da0d316fcc34a75554d59fe6d11d9f0e059e2
\ No newline at end of file
+3fd6f9ad06b786116ca18c1e812363d30cd3060e
\ No newline at end of file

diff --git a/src/printf.c b/src/printf.c
index 17edb0907045b878226343dd073711c9b71f776a..fdd4793c36431671006b845244d0153dd6b704ec 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -606,7 +606,9 @@ void sqlite3VXPrintf(
           while( nPad-- ) bufpt[i++] = '0';
           length = width;
         }
-#endif
+#else
+        length = 0;
+#endif /* SQLITE_OMIT_FLOATING_POINT */
         break;
       case etSIZE:
         *(va_arg(ap,int*)) = pAccum->nChar;