From ac8e45c3312690ff6b49dfc192c217284c569106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Thu, 22 Dec 2022 11:47:15 +0100
Subject: [PATCH] module/mem: cleanup poll-interval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* man page: spell out ‘milliseconds’
* use a ‘static const’ variable for min_poll_interval, instead of a
  macro
---
 doc/yambar-modules-mem.5.scd |  4 ++--
 modules/mem.c                | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/doc/yambar-modules-mem.5.scd b/doc/yambar-modules-mem.5.scd
index 82710c3..7d72256 100644
--- a/doc/yambar-modules-mem.5.scd
+++ b/doc/yambar-modules-mem.5.scd
@@ -33,8 +33,8 @@ mem - This module provides the memory usage
 |  poll-interval
 :  string
 :  no
-:  Refresh interval of the memory usage stats in ms
-   (default=500). Cannot be less then 500 ms.
+:  Refresh interval of the memory usage stats in milliseconds
+   (default=500). Cannot be less then 500ms.
 
 # EXAMPLES
 
diff --git a/modules/mem.c b/modules/mem.c
index 417c8df..54f7f83 100644
--- a/modules/mem.c
+++ b/modules/mem.c
@@ -12,13 +12,14 @@
 
 #define LOG_MODULE "mem"
 #define LOG_ENABLE_DBG 0
-#define SMALLEST_INTERVAL 500
 #include "../bar/bar.h"
 #include "../config-verify.h"
 #include "../config.h"
 #include "../log.h"
 #include "../plugin.h"
 
+static const long min_poll_interval = 500;
+
 struct private
 {
     struct particle *label;
@@ -155,18 +156,19 @@ from_conf(const struct yml_node *node, struct conf_inherit inherited)
     const struct yml_node *c = yml_get_value(node, "content");
 
     return mem_new(
-        interval == NULL ? SMALLEST_INTERVAL : yml_value_as_int(interval),
+        interval == NULL ? min_poll_interval : yml_value_as_int(interval),
         conf_to_particle(c, inherited));
 }
 
 static bool
-conf_verify_interval(keychain_t *chain, const struct yml_node *node)
+conf_verify_poll_interval(keychain_t *chain, const struct yml_node *node)
 {
     if (!conf_verify_unsigned(chain, node))
         return false;
 
-    if (yml_value_as_int(node) < SMALLEST_INTERVAL) {
-        LOG_ERR("%s: interval value cannot be less than %d ms", conf_err_prefix(chain, node), SMALLEST_INTERVAL);
+    if (yml_value_as_int(node) < min_poll_interval) {
+        LOG_ERR("%s: interval value cannot be less than %ldms",
+                conf_err_prefix(chain, node), min_poll_interval);
         return false;
     }
 
@@ -177,7 +179,7 @@ static bool
 verify_conf(keychain_t *chain, const struct yml_node *node)
 {
     static const struct attr_info attrs[] = {
-        {"poll-interval", false, &conf_verify_interval},
+        {"poll-interval", false, &conf_verify_poll_interval},
         MODULE_COMMON_ATTRS,
     };