Merge pull request #2064 from RincewindsHat/feature/new_output_infraHEADmaster

Feature/new output infra

1 files changed, 8 insertions, 7 deletions

diff --git a/plugins/utils.h b/plugins/utils.h
index f939e337..029ae5a6 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -13,11 +13,11 @@ in order to resist overflow attacks. In addition, a few functions are
 provided to standardize version and error reporting across the entire
 suite of plugins. */
 
-/* now some functions etc are being defined in ../lib/utils_base.c */
-#include "utils_base.h"
-
+#include "../config.h"
 #include <stdbool.h>
-
+#include <stdint.h>
+#include <stdio.h>
+#include <time.h>
 
 #ifdef NP_EXTRA_OPTS
 /* Include extra-opts functions if compiled in */
@@ -78,9 +78,6 @@ char *strpcat (char *, const char *, const char *);
 int xvasprintf (char **strp, const char *fmt, va_list ap);
 int xasprintf (char **strp, const char *fmt, ...);
 
-int max_state (int a, int b);
-int max_state_alt (int a, int b);
-
 void usage (const char *) __attribute__((noreturn));
 void usage2(const char *, const char *) __attribute__((noreturn));
 void usage3(const char *, int) __attribute__((noreturn));
@@ -198,4 +195,8 @@ The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\
 copies of the plugins under the terms of the GNU General Public License.\n\
 For more information about these matters, see the file named COPYING.\n")
 
+#define UT_OUTPUT_FORMAT _("\
+ --output-format=OUTPUT_FORMAT\n\
+    Select output format. Valid values: \"multi-line\", \"mp-test-json\"\n")
+
 #endif /* NP_UTILS_H */