Module: monitoring-plugins Branch: master Commit: 69c61625e4f8977cb06a2514a26fc5805f29c531 Author: Lorenz Kästle <12514511+rincewinds...@users.noreply.github.com> Date: Tue Mar 11 16:02:24 2025 +0100 URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=69c61625
typo: mrtgraf -> mrtgtraf --- plugins/Makefile.am | 2 +- plugins/check_mrtgtraf.c | 18 +++++++++--------- plugins/{check_mrtgraf.d => check_mrtgtraf.d}/config.h | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) 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_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_mrtgraf.d/config.h b/plugins/check_mrtgtraf.d/config.h similarity index 83% rename from plugins/check_mrtgraf.d/config.h rename to plugins/check_mrtgtraf.d/config.h index 6d949b50..94929ff7 100644 --- a/plugins/check_mrtgraf.d/config.h +++ b/plugins/check_mrtgtraf.d/config.h @@ -13,10 +13,10 @@ typedef struct { unsigned long outgoing_warning_threshold; unsigned long outgoing_critical_threshold; -} check_mrtgraf_config; +} check_mrtgtraf_config; -check_mrtgraf_config check_mrtgraf_config_init() { - check_mrtgraf_config tmp = { +check_mrtgtraf_config check_mrtgtraf_config_init() { + check_mrtgtraf_config tmp = { .log_file = NULL, .expire_minutes = -1, .use_average = true,