Merge pull request #2085 from RincewindsHat/refactor/check_curl

Refactor/check curl and introduce new output formatting

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/utils_base.c b/lib/utils_base.c
index 29b393d0..e95eeaf0 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -25,6 +25,7 @@
  *****************************************************************************/
 
 #include "../plugins/common.h"
+#include "states.h"
 #include <stdarg.h>
 #include "utils_base.h"
 #include <ctype.h>
@@ -253,7 +254,7 @@ bool check_range(double value, range *my_range) {
                 yes = false;
         }
 
-        if (!my_range->end_infinity && !my_range->start_infinity) {
+        if (!my_range->end_infinity&& !my_range->start_infinity) {
                 if ((my_range->start <= value) && (value <= my_range->end)) {
                         return no;
                 }
@@ -267,7 +268,7 @@ bool check_range(double value, range *my_range) {
                 return yes;
         }
 
-        if (my_range->start_infinity && !my_range->end_infinity) {
+        if (my_range->start_infinity && !my_range->end_infinity ) {
                 if (value <= my_range->end) {
                         return no;
                 }
@@ -277,7 +278,7 @@ bool check_range(double value, range *my_range) {
 }
 
 /* Returns status */
-int get_status(double value, thresholds *my_thresholds) {
+mp_state_enum get_status(double value, thresholds *my_thresholds) {
         if (my_thresholds->critical != NULL) {
                 if (check_range(value, my_thresholds->critical)) {
                         return STATE_CRITICAL;
@@ -393,7 +394,7 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
         return value;
 }
 
-const char *state_text(int result) {
+const char *state_text(mp_state_enum result) {
         switch (result) {
         case STATE_OK:
                 return "OK";