4 files changed, 22 insertions, 2 deletions

diff --git a/lib/output.c b/lib/output.c
index bfd43195..54d505d9 100644
--- a/lib/output.c
+++ b/lib/output.c
@@ -61,6 +61,8 @@ static inline char *fmt_subcheck_perfdata(mp_subcheck check) {
 mp_check mp_check_init(void) {
         mp_check check = {
                 .evaluation_function = &mp_eval_check_default,
+                .default_output_override = NULL,
+                .default_output_override_content = NULL,
         };
         return check;
 }
@@ -283,6 +285,11 @@ char *mp_fmt_output(mp_check check) {
 
         switch (output_format) {
         case MP_FORMAT_MULTI_LINE: {
+                if (check.default_output_override != NULL) {
+                        result = check.default_output_override(check.default_output_override_content);
+                        break;
+                }
+
                 if (check.summary == NULL) {
                         check.summary = get_subcheck_summary(check);
                 }
diff --git a/lib/output.h b/lib/output.h
index c63c8e3f..f5011268 100644
--- a/lib/output.h
+++ b/lib/output.h
@@ -70,6 +70,10 @@ struct mp_check {
 
         // the evaluation_functions computes the state of check
         mp_state_enum (*evaluation_function)(mp_check);
+
+        // override for the default output format
+        char *(*default_output_override)(void *);
+        void *default_output_override_content;
 };
 
 mp_check mp_check_init(void);
diff --git a/lib/perfdata.c b/lib/perfdata.c
index f4eaf843..e3710ec7 100644
--- a/lib/perfdata.c
+++ b/lib/perfdata.c
@@ -251,7 +251,16 @@ char *mp_range_to_string(const mp_range input) {
         if (input.start_infinity) {
                 asprintf(&result, "%s~:", result);
         } else {
-                asprintf(&result, "%s%s:", result, pd_value_to_string(input.start));
+                // check for zeroes, so we can use the short form
+                if ((input.start.type == PD_TYPE_NONE) ||
+                     ((input.start.type == PD_TYPE_INT) && (input.start.pd_int == 0)) ||
+                     ((input.start.type == PD_TYPE_UINT) && (input.start.pd_uint == 0)) ||
+                     ((input.start.type == PD_TYPE_DOUBLE) && (input.start.pd_double == 0))){
+                        // nothing to do here
+                } else {
+                        // Start value is an actual value
+                        asprintf(&result, "%s%s:", result, pd_value_to_string(input.start));
+                }
         }
 
         if (!input.end_infinity) {
diff --git a/lib/utils_base.h b/lib/utils_base.h
index 27884bf0..1da96f78 100644
--- a/lib/utils_base.h
+++ b/lib/utils_base.h
@@ -9,7 +9,7 @@
 #include "./thresholds.h"
 #include "states.h"
 
-#ifndef USE_OPENSSL
+#ifndef MOPL_USE_OPENSSL
 #       include "sha256.h"
 #endif