Transform output format to a global state

This commit removes the format parameter from the mp_check
object and creates a module global variable instead.
This prevents thread safe usage of different mp_check objects
which should likely not present a big problem for now.
The reason for this change is effectively the very same,
the format was lost if an exit was triggered by a signal
handler (timeout in this example).

2 files changed, 15 insertions, 4 deletions

diff --git a/lib/output.c b/lib/output.c
index 17919afc..61fbf832 100644
--- a/lib/output.c
+++ b/lib/output.c
@@ -11,6 +11,9 @@
 #include "perfdata.h"
 #include "states.h"
 
+// == Global variables
+static mp_output_format output_format = MP_FORMAT_DEFAULT;
+
 // == Prototypes ==
 static char *fmt_subcheck_output(mp_output_format output_format, mp_subcheck check, unsigned int indentation);
 static inline cJSON *json_serialize_subcheck(mp_subcheck subcheck);
@@ -55,7 +58,6 @@ static inline char *fmt_subcheck_perfdata(mp_subcheck check) {
  */
 mp_check mp_check_init(void) {
         mp_check check = {0};
-        check.format = MP_FORMAT_DEFAULT;
         return check;
 }
 
@@ -234,7 +236,7 @@ mp_state_enum mp_compute_check_state(const mp_check check) {
 char *mp_fmt_output(mp_check check) {
         char *result = NULL;
 
-        switch (check.format) {
+        switch (output_format) {
         case MP_FORMAT_MULTI_LINE: {
                 if (check.summary == NULL) {
                         check.summary = get_subcheck_summary(check);
@@ -482,7 +484,7 @@ void mp_print_output(mp_check check) { puts(mp_fmt_output(check)); }
  */
 void mp_exit(mp_check check) {
         mp_print_output(check);
-        if (check.format == MP_FORMAT_TEST_JSON) {
+        if (output_format == MP_FORMAT_TEST_JSON) {
                 exit(0);
         }
 
@@ -533,3 +535,7 @@ parsed_output_format mp_parse_output_format(char *format_string) {
 
         return result;
 }
+
+void mp_set_format(mp_output_format format) { output_format = format; }
+
+mp_output_format mp_get_format(void) { return output_format; }
diff --git a/lib/output.h b/lib/output.h
index ffc36f53..2bdfa074 100644
--- a/lib/output.h
+++ b/lib/output.h
@@ -36,13 +36,18 @@ typedef enum output_format {
 #define MP_FORMAT_DEFAULT MP_FORMAT_MULTI_LINE
 
 /*
+ * Format related functions
+ */
+ void mp_set_format(mp_output_format format);
+ mp_output_format mp_get_format(void);
+
+/*
  * The main state object of a plugin. Exists only ONCE per plugin.
  * This is the "root" of a tree of singular checks.
  * The final result is always derived from the children and the "worst" state
  * in the first layer of subchecks
  */
 typedef struct {
-        mp_output_format format; // The output format
         char *summary;           // Overall summary, if not set a summary will be automatically generated
         mp_subcheck_list *subchecks;
 } mp_check;