From 69c61625e4f8977cb06a2514a26fc5805f29c531 Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Tue, 11 Mar 2025 16:02:24 +0100 Subject: typo: mrtgraf -> mrtgtraf --- plugins/Makefile.am | 2 +- plugins/check_mrtgraf.d/config.h | 30 ------------------------------ plugins/check_mrtgtraf.c | 18 +++++++++--------- plugins/check_mrtgtraf.d/config.h | 30 ++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 plugins/check_mrtgraf.d/config.h create mode 100644 plugins/check_mrtgtraf.d/config.h diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 1e4789ff..305924bf 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -56,7 +56,7 @@ EXTRA_DIST = t \ check_dbi.d \ check_ssh.d \ check_dns.d \ - check_mrtgraf.d \ + check_mrtgtraf.d \ check_mysql_query.d \ check_mrtg.d \ check_apt.d \ diff --git a/plugins/check_mrtgraf.d/config.h b/plugins/check_mrtgraf.d/config.h deleted file mode 100644 index 6d949b50..00000000 --- a/plugins/check_mrtgraf.d/config.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include "../../config.h" -#include -#include - -typedef struct { - char *log_file; - int expire_minutes; - bool use_average; - unsigned long incoming_warning_threshold; - unsigned long incoming_critical_threshold; - unsigned long outgoing_warning_threshold; - unsigned long outgoing_critical_threshold; - -} check_mrtgraf_config; - -check_mrtgraf_config check_mrtgraf_config_init() { - check_mrtgraf_config tmp = { - .log_file = NULL, - .expire_minutes = -1, - .use_average = true, - - .incoming_warning_threshold = 0, - .incoming_critical_threshold = 0, - .outgoing_warning_threshold = 0, - .outgoing_critical_threshold = 0, - }; - return tmp; -} diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c index c9e26099..8c7cf8aa 100644 --- a/plugins/check_mrtgtraf.c +++ b/plugins/check_mrtgtraf.c @@ -33,16 +33,16 @@ const char *progname = "check_mrtgtraf"; const char *copyright = "1999-2024"; const char *email = "devel@monitoring-plugins.org"; -#include "check_mrtgraf.d/config.h" +#include "check_mrtgtraf.d/config.h" #include "common.h" #include "utils.h" typedef struct { int errorcode; - check_mrtgraf_config config; -} check_mrtgraf_config_wrapper; + check_mrtgtraf_config config; +} check_mrtgtraf_config_wrapper; -static check_mrtgraf_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/); +static check_mrtgtraf_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/); static void print_help(void); void print_usage(void); @@ -54,12 +54,12 @@ int main(int argc, char **argv) { /* Parse extra opts if any */ argv = np_extra_opts(&argc, argv, progname); - check_mrtgraf_config_wrapper tmp_config = process_arguments(argc, argv); + check_mrtgtraf_config_wrapper tmp_config = process_arguments(argc, argv); if (tmp_config.errorcode == ERROR) { usage4(_("Could not parse arguments")); } - const check_mrtgraf_config config = tmp_config.config; + const check_mrtgtraf_config config = tmp_config.config; /* open the MRTG log file for reading */ FILE *mrtg_log_file_ptr = fopen(config.log_file, "r"); @@ -200,7 +200,7 @@ int main(int argc, char **argv) { } /* process command-line arguments */ -check_mrtgraf_config_wrapper process_arguments(int argc, char **argv) { +check_mrtgtraf_config_wrapper process_arguments(int argc, char **argv) { static struct option longopts[] = {{"filename", required_argument, 0, 'F'}, {"expires", required_argument, 0, 'e'}, {"aggregation", required_argument, 0, 'a'}, @@ -210,9 +210,9 @@ check_mrtgraf_config_wrapper process_arguments(int argc, char **argv) { {"help", no_argument, 0, 'h'}, {0, 0, 0, 0}}; - check_mrtgraf_config_wrapper result = { + check_mrtgtraf_config_wrapper result = { .errorcode = OK, - .config = check_mrtgraf_config_init(), + .config = check_mrtgtraf_config_init(), }; if (argc < 2) { result.errorcode = ERROR; diff --git a/plugins/check_mrtgtraf.d/config.h b/plugins/check_mrtgtraf.d/config.h new file mode 100644 index 00000000..94929ff7 --- /dev/null +++ b/plugins/check_mrtgtraf.d/config.h @@ -0,0 +1,30 @@ +#pragma once + +#include "../../config.h" +#include +#include + +typedef struct { + char *log_file; + int expire_minutes; + bool use_average; + unsigned long incoming_warning_threshold; + unsigned long incoming_critical_threshold; + unsigned long outgoing_warning_threshold; + unsigned long outgoing_critical_threshold; + +} check_mrtgtraf_config; + +check_mrtgtraf_config check_mrtgtraf_config_init() { + check_mrtgtraf_config tmp = { + .log_file = NULL, + .expire_minutes = -1, + .use_average = true, + + .incoming_warning_threshold = 0, + .incoming_critical_threshold = 0, + .outgoing_warning_threshold = 0, + .outgoing_critical_threshold = 0, + }; + return tmp; +} -- cgit v1.2.3-74-g34f1