aboutsummaryrefslogtreecommitdiff
path: root/src/func.c
diff options
context:
space:
mode:
authorstephan <stephan@noemail.net>2022-11-17 15:21:49 +0000
committerstephan <stephan@noemail.net>2022-11-17 15:21:49 +0000
commitc7c15d1b83574f7ceec81bd76e76521f03efb1c8 (patch)
tree6c411a9ba5a9585770e8fe29d2adcf42c65fa18b /src/func.c
parentb0ab21dee40144d8aec92df4a0c98eb069badeb3 (diff)
parent3c1572ddb43ba7f4cbae57ee4b019a2cd45ee015 (diff)
downloadsqlite-c7c15d1b83574f7ceec81bd76e76521f03efb1c8.tar.gz
sqlite-c7c15d1b83574f7ceec81bd76e76521f03efb1c8.zip
Merge trunk into js-cpp branch.
FossilOrigin-Name: e047b33d1fb7d6a32e967f03f9952249cd2da4d21dc301fe92bd7baa0da5d6a9
Diffstat (limited to 'src/func.c')
-rw-r--r--src/func.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/func.c b/src/func.c
index b42b2588a..3c5a85230 100644
--- a/src/func.c
+++ b/src/func.c
@@ -2106,17 +2106,15 @@ static void logFunc(
}
ans = log(x)/b;
}else{
- ans = log(x);
switch( SQLITE_PTR_TO_INT(sqlite3_user_data(context)) ){
case 1:
- /* Convert from natural logarithm to log base 10 */
- ans /= M_LN10;
+ ans = log10(x);
break;
case 2:
- /* Convert from natural logarithm to log base 2 */
- ans /= M_LN2;
+ ans = log2(x);
break;
default:
+ ans = log(x);
break;
}
}