graphs: Simplify headers by removing option to pass extra arguments

We should keep it so that the macros print simple things and we won't
have to deal with the extra arguments.

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

diff --git a/src/daemon/graphs/graph.h b/src/daemon/graphs/graph.h
index c5267cef2ae47175cf75f0498938d3cb5a83d012..3c2e673d77d80084c0556484bcd0ac333f040868 100644 (file)
--- a/src/daemon/graphs/graph.h
+++ b/src/daemon/graphs/graph.h
@@ -112,23 +112,24 @@
 
 // Add something to the legend of the graph
 #define PRINT_EMPTY_LINE(args)                                                 SCRIPT(args, "COMMENT: \\n")
-#define PRINT_HEADER(args, label, ...)                                 SCRIPT(args, "COMMENT:" COLUMN __VA_ARGS__, label)
-#define PRINT_LABEL(args, label, ...)                                  SCRIPT(args, "COMMENT: %-31s" __VA_ARGS__, label)
-#define PRINT_EMPTY_LABEL(args, ...)                                   SCRIPT(args, "COMMENT:                                " __VA_ARGS__)
-#define PRINT_NOTHING(args, ...)                                               SCRIPT(args, "COMMENT:                " __VA_ARGS__)
+#define PRINT_HEADER(args, label)                                              SCRIPT(args, "COMMENT:" COLUMN, label)
+#define PRINT_LABEL(args, label)                                               SCRIPT(args, "COMMENT: %-31s", label)
+#define PRINT_EMPTY_LABEL(args)                                                        SCRIPT(args, "COMMENT:                                ")
+#define PRINT_NOTHING(args)                                                            SCRIPT(args, "COMMENT:                ")
 #define PRINT(args, field, object, format, ...) \
        SCRIPT(args, "GPRINT:" FIELD ":" format, FIELD_AND_OBJECT(field, object) ##__VA_ARGS__)
-#define PRINT_PERCENTAGE(args, field, object, ...)             PRINT(args, field, object, PERCENTAGE, __VA_ARGS__)
-#define PRINT_INTEGER(args, field, object, ...)                        PRINT(args, field, object, INTEGER, __VA_ARGS__)
-#define PRINT_LARGE_INTEGER(args, field, object, ...)  PRINT(args, field, object, LARGE_INTEGER, __VA_ARGS__)
-#define PRINT_FLOAT(args, field, object, ...)                  PRINT(args, field, object, FLOAT, __VA_ARGS__)
-#define PRINT_LARGE_FLOAT(args, field, object, ...)            PRINT(args, field, object, LARGE_FLOAT, __VA_ARGS__)
+#define PRINT_PERCENTAGE(args, field, object)                  PRINT(args, field, object, PERCENTAGE)
+#define PRINT_INTEGER(args, field, object)                             PRINT(args, field, object, INTEGER)
+#define PRINT_LARGE_INTEGER(args, field, object)               PRINT(args, field, object, LARGE_INTEGER)
+#define PRINT_FLOAT(args, field, object)                               PRINT(args, field, object, FLOAT)
+#define PRINT_LARGE_FLOAT(args, field, object)                 PRINT(args, field, object, LARGE_FLOAT)
 #define PRINT_EOL(args)                                                                        SCRIPT(args, "COMMENT:" EOL)
 
 #define PRINT_HEADER1(args, header1) \
        do { \
                PRINT_EMPTY_LABEL(args); \
-               PRINT_HEADER(args, header1, EOL); \
+               PRINT_HEADER(args, header1); \
+               PRINT_EOL(args); \
        } while (0)
 
 #define PRINT_HEADER4(args, header1, header2, header3, header4) \
@@ -137,7 +138,8 @@
                PRINT_HEADER(args, header1); \
                PRINT_HEADER(args, header2); \
                PRINT_HEADER(args, header3); \
-               PRINT_HEADER(args, header4, EOL); \
+               PRINT_HEADER(args, header4); \
+               PRINT_EOL(args); \
        } while (0)
 
 // Handles for fields