1 files changed, 12 insertions, 39 deletions

diff --git a/lib/utils_base.h b/lib/utils_base.h
index a209cb6d..27884bf0 100644
--- a/lib/utils_base.h
+++ b/lib/utils_base.h
@@ -2,6 +2,13 @@
 #define _UTILS_BASE_
 /* Header file for Monitoring Plugins utils_base.c */
 
+#include "../config.h"
+#include <time.h>
+
+#include "./perfdata.h"
+#include "./thresholds.h"
+#include "states.h"
+
 #ifndef USE_OPENSSL
 #       include "sha256.h"
 #endif
@@ -19,39 +26,8 @@
 #define OUTSIDE 0
 #define INSIDE  1
 
-typedef struct range_struct {
-        double start;
-        bool start_infinity;
-        double end;
-        int end_infinity;
-        int alert_on; /* OUTSIDE (default) or INSIDE */
-        char *text;   /* original unparsed text input */
-} range;
-
-typedef struct thresholds_struct {
-        range *warning;
-        range *critical;
-} thresholds;
-
-#define NP_STATE_FORMAT_VERSION 1
-
-typedef struct state_data_struct {
-        time_t time;
-        void *data;
-        int length; /* Of binary data */
-} state_data;
-
-typedef struct state_key_struct {
-        char *name;
-        char *plugin_name;
-        int data_version;
-        char *_filename;
-        state_data *state_data;
-} state_key;
-
 typedef struct np_struct {
         char *plugin_name;
-        state_key *state;
         int argc;
         char **argv;
 } monitoring_plugin;
@@ -61,10 +37,11 @@ int _set_thresholds(thresholds **, char *, char *);
 void set_thresholds(thresholds **, char *, char *);
 void print_thresholds(const char *, thresholds *);
 bool check_range(double, range *);
-int get_status(double, thresholds *);
+bool mp_check_range(mp_perfdata_value, mp_range);
+mp_state_enum get_status(double, thresholds *);
 
 /* Handle timeouts */
-extern int timeout_state;
+extern mp_state_enum timeout_state;
 extern unsigned int timeout_interval;
 
 /* All possible characters in a threshold range */
@@ -106,13 +83,9 @@ char *np_extract_value(const char *, const char *, char);
  */
 int mp_translate_state(char *);
 
-void np_enable_state(char *, int);
-state_data *np_state_read();
-void np_state_write_string(time_t, char *);
-
 void np_init(char *, int argc, char **argv);
 void np_set_args(int argc, char **argv);
-void np_cleanup();
-const char *state_text(int);
+void np_cleanup(void);
+const char *state_text(mp_state_enum);
 
 #endif /* _UTILS_BASE_ */