Obsolete the CUSTOM_METERMODE use in default mode

The use of CUSTOM_METERMODE value in meter default mode was a bad
design. There are no meter that really has a "custom" mode to work with
and currently that value serves as a useless placeholder that hides the
real default mode for a meter.

Replace CUSTOM_METERMODE in `defaultMode` of all meters with the real
intended default modes. Currently only CPU meters and MemorySwapMeter
used this, and their real defaults are BAR_METERMODE.

In Meter_setMode(), remove the special treatment of `defaultMode ==
CUSTOM_METERMODE`, Meter_setMode() still calls the `updateMode` function
for custom treatment when it's present for a meter class.

As CUSTOM_METERMODE is obsolete from `defaultMode`, the init functions
of CPU meters and MemorySwapMeter need to be adjusted to avoid
incomplete initialization (Meter.draw function bring NULL).

Signed-off-by: Kang-Che Sung <explorer09@gmail.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/Meter.c b/Meter.c
index 938b907b..1fc7e9db 100644
--- a/Meter.c
+++ b/Meter.c
@@ -122,11 +122,10 @@ void Meter_setMode(Meter* this, int modeIndex) {
    }
 
    assert(modeIndex < LAST_METERMODE);
-   if (Meter_defaultMode(this) == CUSTOM_METERMODE) {
+   if (Meter_updateModeFn(this)) {
+      assert(Meter_drawFn(this));
       this->draw = Meter_drawFn(this);
-      if (Meter_updateModeFn(this)) {
-         Meter_updateMode(this, modeIndex);
-      }
+      Meter_updateMode(this, modeIndex);
    } else {
       assert(modeIndex >= 1);
       free(this->drawData.values);