From 328b53b166b59d2fb5258f464dd45745d6df8011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Fri, 5 Nov 2021 17:20:17 +0100
Subject: [PATCH] config: let value_to_double() log errors

---
 config.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/config.c b/config.c
index 60a123da..f0896158 100644
--- a/config.c
+++ b/config.c
@@ -501,7 +501,12 @@ value_to_double(struct context *ctx, double *res)
     char *end = NULL;
 
     *res = strtod(s, &end);
-    return errno == 0 && *end == '\0';
+    if (!(errno == 0 && *end == '\0')) {
+        LOG_CONTEXTUAL_ERR("invalid decimal value");
+        return false;
+    }
+
+    return true;
 }
 
 static bool NOINLINE
@@ -590,10 +595,8 @@ value_to_pt_or_px(struct context *ctx, struct pt_or_px *res)
         res->px = value;
     } else {
         double value;
-        if (!value_to_double(ctx, &value)) {
-            LOG_CONTEXTUAL_ERR("invalid decimal value");
+        if (!value_to_double(ctx, &value))
             return false;
-        }
         res->pt = value;
         res->px = 0;
     }
@@ -1130,11 +1133,8 @@ parse_section_scrollback(struct context *ctx)
 
     else if (strcmp(key, "multiplier") == 0) {
         double multiplier;
-        if (!value_to_double(ctx, &multiplier)) {
-            LOG_CONTEXTUAL_ERR("invalid decimal value");
+        if (!value_to_double(ctx, &multiplier))
             return false;
-        }
-
         conf->scrollback.multiplier = multiplier;
     }
 
@@ -1324,8 +1324,11 @@ parse_section_colors(struct context *ctx)
 
     else if (strcmp(key, "alpha") == 0) {
         double alpha;
-        if (!value_to_double(ctx, &alpha) || alpha < 0. || alpha > 1.) {
-            LOG_CONTEXTUAL_ERR("invalid decimal value, or not in range 0.0-1.0");
+        if (!value_to_double(ctx, &alpha))
+            return false;
+
+        if (alpha < 0. || alpha > 1.) {
+            LOG_CONTEXTUAL_ERR("not in range 0.0-1.0");
             return false;
         }
 
@@ -2429,10 +2432,8 @@ parse_section_tweak(struct context *ctx)
 
     else if (strcmp(key, "box-drawing-base-thickness") == 0) {
         double base_thickness;
-        if (!value_to_double(ctx, &base_thickness)) {
-            LOG_CONTEXTUAL_ERR("invalid decimal value");
+        if (!value_to_double(ctx, &base_thickness))
             return false;
-        }
 
         conf->tweak.box_drawing_base_thickness = base_thickness;
         LOG_WARN("tweak: box-drawing-base-thickness=%f",