From c150e4bde9080799c7c9f115565c8324faa953be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Fri, 18 Dec 2020 15:49:37 +0100
Subject: Enable -Wformat=2

Now that the global format variable Process_pidFormat is gone, enable
the compiler warning -Wformat=2.
---
 BatteryMeter.c | 29 +++++++++++++----------------
 configure.ac   |  1 +
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/BatteryMeter.c b/BatteryMeter.c
index 4836809b..2c808c72 100644
--- a/BatteryMeter.c
+++ b/BatteryMeter.c
@@ -35,24 +35,21 @@ static void BatteryMeter_updateValues(Meter* this, char* buffer, size_t len) {
 
    this->values[0] = percent;
 
-   const char *onAcText, *onBatteryText, *unknownText;
-
-   unknownText = "%.1f%%";
-   if (this->mode == TEXT_METERMODE) {
-      onAcText = "%.1f%% (Running on A/C)";
-      onBatteryText = "%.1f%% (Running on battery)";
-   } else {
-      onAcText = "%.1f%%(A/C)";
-      onBatteryText = "%.1f%%(bat)";
+   const char* text;
+   switch (isOnAC) {
+   case AC_PRESENT:
+      text = this->mode == TEXT_METERMODE ? " (Running on A/C)" : "(A/C)";
+      break;
+   case AC_ABSENT:
+      text = this->mode == TEXT_METERMODE ? " (Running on battery)" : "(bat)";
+      break;
+   case AC_ERROR:
+   default:
+      text = "";
+      break;
    }
 
-   if (isOnAC == AC_PRESENT) {
-      xSnprintf(buffer, len, onAcText, percent);
-   } else if (isOnAC == AC_ABSENT) {
-      xSnprintf(buffer, len, onBatteryText, percent);
-   } else {
-      xSnprintf(buffer, len, unknownText, percent);
-   }
+   xSnprintf(buffer, len, "%.1f%%%s", percent, text);
 }
 
 const MeterClass BatteryMeter_class = {
diff --git a/configure.ac b/configure.ac
index 5c39b405..f303ff03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -333,6 +333,7 @@ AM_CFLAGS="\
  -Wcast-qual\
  -Wextra\
  -Wfloat-equal\
+ -Wformat=2\
  -Wmissing-format-attribute\
  -Wmissing-noreturn\
  -Wmissing-prototypes\
-- 
cgit v1.2.3