Remove an unreachable branch from the sqlite3_value_numeric_type() interface.

FossilOrigin-Name: 5350229b52b18a4961858a30538c5c75e5bd3048

diff --git a/manifest b/manifest
index 480568c8f048a20644d8b3d83844f5413a4e0d1d..4de9f86a2734133b230408252981ca02541abf57 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sunnecessary\sno-op\scalls\sto\sapplyNumericAffinity()\sfor\sa\ssmall\nperformance\simprovement.
-D 2014-07-26T16:47:23.387
+C Remove\san\sunreachable\sbranch\sfrom\sthe\ssqlite3_value_numeric_type()\sinterface.
+D 2014-07-26T20:12:56.006
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -283,7 +283,7 @@ F src/update.c 01564b3c430f6c7b0a35afaf7aba7987206fa3a5
 F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
 F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e
 F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
-F src/vdbe.c 145f909c1c7b16b0899bcab8b241b811e4af9534
+F src/vdbe.c b127f05ff110c1f640b5aff98fa57d5028c8f2ee
 F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
 F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df
 F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
@@ -1184,7 +1184,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P e0fa6fdc14ac5458f9200cbae124f8025ea534ea
-R 497e2677c499db4d4a797e5c1acd577b
+P 413d7287977702fa651c0140bd5cf29021fe3e79
+R 882befeb8b61995267c9bc4311daa690
 U drh
-Z ee817a86e8cc0ab5547d2241830d36e2
+Z 28fa8e103cbfa69958d1f03600e24fde

diff --git a/manifest.uuid b/manifest.uuid
index 06b44f1d10c6a7f223396d3917f4b46126a27fed..58f6f007dbbccffdbdddda9753e5437493c8953a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-413d7287977702fa651c0140bd5cf29021fe3e79
\ No newline at end of file
+5350229b52b18a4961858a30538c5c75e5bd3048
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 49183129aa6489e97646cf880c4718e3cc6c95b1..a00a1da836f43bc2310660b1536be51ad71b11db 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -292,7 +292,7 @@ int sqlite3_value_numeric_type(sqlite3_value *pVal){
   int eType = sqlite3_value_type(pVal);
   if( eType==SQLITE_TEXT ){
     Mem *pMem = (Mem*)pVal;
-    ApplyNumericAffinity(pMem);
+    applyNumericAffinity(pMem);
     eType = sqlite3_value_type(pVal);
   }
   return eType;