From b2ada278403e643a3bc339783740f262b7879803 Mon Sep 17 00:00:00 2001
From: Ivan Shapovalov <intelfx@intelfx.name>
Date: Sun, 12 Mar 2023 20:17:03 +0400
Subject: {Memory,Swap}Meter: make sure new constants are used consistently

---
 MemoryMeter.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'MemoryMeter.c')

diff --git a/MemoryMeter.c b/MemoryMeter.c
index ac01dfe7..1dad1356 100644
--- a/MemoryMeter.c
+++ b/MemoryMeter.c
@@ -34,7 +34,9 @@ static void MemoryMeter_updateValues(Meter* this) {
    Platform_setMemoryValues(this);
 
    /* Do not print available memory in bar mode */
-   this->curItems = 4;
+   static_assert(MEMORY_METER_AVAILABLE + 1 == MEMORY_METER_ITEMCOUNT,
+      "MEMORY_METER_AVAILABLE is not the last item in MemoryMeterValues");
+   this->curItems = MEMORY_METER_AVAILABLE;
 
    written = Meter_humanUnit(buffer, this->values[MEMORY_METER_USED], size);
    METER_BUFFER_CHECK(buffer, size, written);
@@ -87,7 +89,7 @@ const MeterClass MemoryMeter_class = {
    },
    .updateValues = MemoryMeter_updateValues,
    .defaultMode = BAR_METERMODE,
-   .maxItems = 5,
+   .maxItems = MEMORY_METER_ITEMCOUNT,
    .total = 100.0,
    .attributes = MemoryMeter_attributes,
    .name = "Memory",
-- 
cgit v1.2.3