graphs: Add macro to format headers

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/daemon/graphs/conntrack.c b/src/daemon/graphs/conntrack.c
index d0ab001731a6cbd4b37daaa9ee2f9313679f4a29..c058480f63c529e747049de3e27250bf4747083e 100644 (file)
--- a/src/daemon/graphs/conntrack.c
+++ b/src/daemon/graphs/conntrack.c
@@ -62,11 +62,7 @@ static int conntrack_render(collecty_ctx* ctx,
        PRINT_LARGE_INTEGER(args, "count_max", EOL);
 
        // Header
-       PRINT_EMPTY_LABEL(args);
-       PRINT_HEADER(args, _("Current"));
-       PRINT_HEADER(args, _("Average"));
-       PRINT_HEADER(args, _("Minimum"));
-       PRINT_HEADER(args, _("Maximum"), EOL);
+       PRINT_HEADER4(args, _("Current"), _("Average"), _("Minimum"), _("Maximum"));
 
        return 0;
 }

diff --git a/src/daemon/graphs/graph.h b/src/daemon/graphs/graph.h
index 2dffddb90d51d031fb17b4761b14a81377c7e8ff..97181d3490cd5da84d95e3163cdb73d9b4fb448a 100644 (file)
--- a/src/daemon/graphs/graph.h
+++ b/src/daemon/graphs/graph.h
@@ -93,4 +93,13 @@
 #define PRINT_FLOAT(args, field, ...)                  PRINT(args, field, FLOAT __VA_ARGS__)
 #define PRINT_LARGE_FLOAT(args, field, ...)            PRINT(args, field, LARGE_FLOAT __VA_ARGS__)
 
+#define PRINT_HEADER4(args, header1, header2, header3, header4) \
+       do { \
+               PRINT_EMPTY_LABEL(args); \
+               PRINT_HEADER(args, header1); \
+               PRINT_HEADER(args, header2); \
+               PRINT_HEADER(args, header3); \
+               PRINT_HEADER(args, header4, EOL); \
+       } while (0)
+
 #endif /* COLLECTY_GRAPHS_GRAPH_H */

diff --git a/src/daemon/graphs/loadavg.c b/src/daemon/graphs/loadavg.c
index c2d51ab74ca37ef19e5c5abdf1e34aa1ec347e02..4ce63d0cc9b7de4cfe9d70bdc71cbb929972a5e6 100644 (file)
--- a/src/daemon/graphs/loadavg.c
+++ b/src/daemon/graphs/loadavg.c
@@ -64,11 +64,7 @@ static int loadavg_render(collecty_ctx* ctx,
        PRINT_FLOAT(args, "load1_max", EOL);
 
        // Header
-       PRINT_EMPTY_LABEL(args);
-       PRINT_HEADER(args, _("Current"));
-       PRINT_HEADER(args, _("Average"));
-       PRINT_HEADER(args, _("Minimum"));
-       PRINT_HEADER(args, _("Maximum"), EOL);
+       PRINT_HEADER4(args, _("Current"), _("Average"), _("Minimum"), _("Maximum"));
 
        return 0;
 }