A simpler fix to the problem described by

[forum:/forumpost/d1387c3979c7f557|forum thread d1387c3979c7f557].
See specifically [forum:/forumpost/2d2ddc5b70c31de5|post 2d2ddc5b70c31de5].
This approach is simpler, but it also runs a little slower.

FossilOrigin-Name: 334d22bc70916dfc36fbd2b8e45455b09c7d20d33855ce132797270267ee28fc

diff --git a/manifest b/manifest
index e6f9823458d061490c7b266ce5d57514f1f24a42..093ab86d35382d949da1c0357e6035103a6b5089 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sand\sa\scode\sindentation\serror.
-D 2023-02-23T14:43:15.500
+C A\ssimpler\sfix\sto\sthe\sproblem\sdescribed\sby\n[forum:/forumpost/d1387c3979c7f557|forum\sthread\sd1387c3979c7f557].\nSee\sspecifically\s[forum:/forumpost/2d2ddc5b70c31de5|post\s2d2ddc5b70c31de5].\nThis\sapproach\sis\ssimpler,\sbut\sit\salso\sruns\sa\slittle\sslower.
+D 2023-02-24T01:37:57.650
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -617,7 +617,7 @@ F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
 F src/pragma.c 82d5090a35eac75876d3b41f48d06b2370553c9576bf2942233c462e03eb94c9
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c ce87a08cfddd45a147150db34190b1986f2d4a0e0828858cb6bd908c78fb02e3
-F src/printf.c ff4b05e38bf928ff1b80d3dda4f977b10fe39ecbfe69c018224c7e5594fb2455
+F src/printf.c 91836661dfe93303389bbb5a9c41488bba528e0e93ba89df1b8581fcb92aa205
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d62c5665279cc7485f9d45b5e20911cc7b19c203f268321a90d05d74f4725750
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
@@ -2046,8 +2046,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7ee22f95e7a7d8650f961f20e304e56c7813e624f05655d7392ca9347748270f
-R 6f3dc9114a2c05702b3aef7d84d0887b
+P de6c5c6bb49a0beca793cdc0462da2c17bb05f3292e08dd815be29b45b59a8fb
+R 5fa9578574fba5a8667a76b65d53fb9e
+T *branch * fp-conversion-simpler
+T *sym-fp-conversion-simpler *
+T -sym-trunk *
 U drh
-Z ad82adef5ba3f74b5f1d1691fda9e306
+Z 34fe21e03e6feeb814c51c1776e25371
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 1982ec0f0e1dbcf24c2e2f3d52cf3bcaa014ee4c..97d4fc923f8998eab679a54c3571ec7a5e3124f5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-de6c5c6bb49a0beca793cdc0462da2c17bb05f3292e08dd815be29b45b59a8fb
\ No newline at end of file
+334d22bc70916dfc36fbd2b8e45455b09c7d20d33855ce132797270267ee28fc
\ No newline at end of file

diff --git a/src/printf.c b/src/printf.c
index 335ad0684489883524064b631e9a5033de774d66..9f19af572247c5d2174535dd8f6ce9ce27a49c3f 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -137,7 +137,7 @@ static char et_getdigit(LONGDOUBLE_TYPE *val, int *cnt){
   digit = (int)*val;
   d = digit;
   digit += '0';
-  *val = (*val - d)*10.0;
+  *val = *val*10.0 - d*10.0;
   return (char)digit;
 }
 #endif /* SQLITE_OMIT_FLOATING_POINT */