diff options
| -rw-r--r-- | lib/perfdata.c | 14 | ||||
| -rw-r--r-- | lib/perfdata.h | 3 | ||||
| -rw-r--r-- | plugins/check_curl.c | 6 | ||||
| -rw-r--r-- | plugins/check_dbi.c | 4 | ||||
| -rw-r--r-- | plugins/check_disk.c | 4 | ||||
| -rw-r--r-- | plugins/check_ldap.c | 8 | ||||
| -rw-r--r-- | plugins/check_mrtg.c | 8 | ||||
| -rw-r--r-- | plugins/check_mysql.c | 4 | ||||
| -rw-r--r-- | plugins/check_mysql_query.c | 4 | ||||
| -rw-r--r-- | plugins/check_ntp_peer.c | 16 | ||||
| -rw-r--r-- | plugins/check_ntp_time.c | 4 | ||||
| -rw-r--r-- | plugins/check_pgsql.c | 8 | ||||
| -rw-r--r-- | plugins/check_real.c | 4 | ||||
| -rw-r--r-- | plugins/check_smtp.c | 4 | ||||
| -rw-r--r-- | plugins/check_snmp.d/check_snmp_helpers.c | 4 | ||||
| -rw-r--r-- | plugins/check_users.c | 4 |
16 files changed, 50 insertions, 49 deletions
diff --git a/lib/perfdata.c b/lib/perfdata.c index b447b8ea..138df53b 100644 --- a/lib/perfdata.c +++ b/lib/perfdata.c | |||
| @@ -393,7 +393,7 @@ mp_range_parsed mp_parse_range_string(const char *input) { | |||
| 393 | 393 | ||
| 394 | mp_range_parsed result = { | 394 | mp_range_parsed result = { |
| 395 | .range = mp_range_init(), | 395 | .range = mp_range_init(), |
| 396 | .error = MP_PARSING_SUCCES, | 396 | .error = MP_PARSING_SUCCESS, |
| 397 | }; | 397 | }; |
| 398 | 398 | ||
| 399 | if (input[0] == '@') { | 399 | if (input[0] == '@') { |
| @@ -436,7 +436,7 @@ mp_range_parsed mp_parse_range_string(const char *input) { | |||
| 436 | result.range.start_infinity = false; | 436 | result.range.start_infinity = false; |
| 437 | perfdata_value_parser_wrapper parsed_pd = parse_pd_value(input); | 437 | perfdata_value_parser_wrapper parsed_pd = parse_pd_value(input); |
| 438 | 438 | ||
| 439 | if (parsed_pd.error != MP_PARSING_SUCCES) { | 439 | if (parsed_pd.error != MP_PARSING_SUCCESS) { |
| 440 | result.error = parsed_pd.error; | 440 | result.error = parsed_pd.error; |
| 441 | free(working_copy); | 441 | free(working_copy); |
| 442 | return result; | 442 | return result; |
| @@ -457,7 +457,7 @@ mp_range_parsed mp_parse_range_string(const char *input) { | |||
| 457 | } else { | 457 | } else { |
| 458 | perfdata_value_parser_wrapper parsed_pd = parse_pd_value(input); | 458 | perfdata_value_parser_wrapper parsed_pd = parse_pd_value(input); |
| 459 | 459 | ||
| 460 | if (parsed_pd.error != MP_PARSING_SUCCES) { | 460 | if (parsed_pd.error != MP_PARSING_SUCCESS) { |
| 461 | result.error = parsed_pd.error; | 461 | result.error = parsed_pd.error; |
| 462 | return result; | 462 | return result; |
| 463 | } | 463 | } |
| @@ -470,7 +470,7 @@ mp_range_parsed mp_parse_range_string(const char *input) { | |||
| 470 | 470 | ||
| 471 | double_parser_wrapper parse_double(const char *input) { | 471 | double_parser_wrapper parse_double(const char *input) { |
| 472 | double_parser_wrapper result = { | 472 | double_parser_wrapper result = { |
| 473 | .error = MP_PARSING_SUCCES, | 473 | .error = MP_PARSING_SUCCESS, |
| 474 | }; | 474 | }; |
| 475 | 475 | ||
| 476 | if (input == NULL) { | 476 | if (input == NULL) { |
| @@ -501,7 +501,7 @@ double_parser_wrapper parse_double(const char *input) { | |||
| 501 | 501 | ||
| 502 | integer_parser_wrapper parse_integer(const char *input) { | 502 | integer_parser_wrapper parse_integer(const char *input) { |
| 503 | integer_parser_wrapper result = { | 503 | integer_parser_wrapper result = { |
| 504 | .error = MP_PARSING_SUCCES, | 504 | .error = MP_PARSING_SUCCESS, |
| 505 | }; | 505 | }; |
| 506 | 506 | ||
| 507 | if (input == NULL) { | 507 | if (input == NULL) { |
| @@ -548,7 +548,7 @@ perfdata_value_parser_wrapper parse_pd_value(const char *input) { | |||
| 548 | // try integer first | 548 | // try integer first |
| 549 | integer_parser_wrapper tmp_int = parse_integer(input); | 549 | integer_parser_wrapper tmp_int = parse_integer(input); |
| 550 | 550 | ||
| 551 | if (tmp_int.error == MP_PARSING_SUCCES) { | 551 | if (tmp_int.error == MP_PARSING_SUCCESS) { |
| 552 | perfdata_value_parser_wrapper result = { | 552 | perfdata_value_parser_wrapper result = { |
| 553 | .error = tmp_int.error, | 553 | .error = tmp_int.error, |
| 554 | .value = tmp_int.value, | 554 | .value = tmp_int.value, |
| @@ -558,7 +558,7 @@ perfdata_value_parser_wrapper parse_pd_value(const char *input) { | |||
| 558 | 558 | ||
| 559 | double_parser_wrapper tmp_double = parse_double(input); | 559 | double_parser_wrapper tmp_double = parse_double(input); |
| 560 | perfdata_value_parser_wrapper result = {}; | 560 | perfdata_value_parser_wrapper result = {}; |
| 561 | if (tmp_double.error == MP_PARSING_SUCCES) { | 561 | if (tmp_double.error == MP_PARSING_SUCCESS) { |
| 562 | result.error = tmp_double.error; | 562 | result.error = tmp_double.error; |
| 563 | result.value = tmp_double.value; | 563 | result.value = tmp_double.value; |
| 564 | } else { | 564 | } else { |
diff --git a/lib/perfdata.h b/lib/perfdata.h index e51ef5fd..d7e5670a 100644 --- a/lib/perfdata.h +++ b/lib/perfdata.h | |||
| @@ -111,7 +111,8 @@ mp_range mp_range_set_end(mp_range, mp_perfdata_value); | |||
| 111 | */ | 111 | */ |
| 112 | 112 | ||
| 113 | typedef enum { | 113 | typedef enum { |
| 114 | MP_PARSING_SUCCES = 0, | 114 | MP_PARSING_SUCCESS = 0, |
| 115 | MP_PARSING_SUCCES = MP_PARSING_SUCCESS, | ||
| 115 | MP_PARSING_FAILURE, | 116 | MP_PARSING_FAILURE, |
| 116 | MP_RANGE_PARSING_FAILURE, | 117 | MP_RANGE_PARSING_FAILURE, |
| 117 | MP_RANGE_PARSING_UNDERFLOW, | 118 | MP_RANGE_PARSING_UNDERFLOW, |
diff --git a/plugins/check_curl.c b/plugins/check_curl.c index 95e45282..d7d68de5 100644 --- a/plugins/check_curl.c +++ b/plugins/check_curl.c | |||
| @@ -990,7 +990,7 @@ check_curl_config_wrapper process_arguments(int argc, char **argv) { | |||
| 990 | case 'c': /* critical time threshold */ | 990 | case 'c': /* critical time threshold */ |
| 991 | { | 991 | { |
| 992 | mp_range_parsed critical_range = mp_parse_range_string(optarg); | 992 | mp_range_parsed critical_range = mp_parse_range_string(optarg); |
| 993 | if (critical_range.error != MP_PARSING_SUCCES) { | 993 | if (critical_range.error != MP_PARSING_SUCCESS) { |
| 994 | die(STATE_UNKNOWN, "failed to parse critical threshold: %s", optarg); | 994 | die(STATE_UNKNOWN, "failed to parse critical threshold: %s", optarg); |
| 995 | } | 995 | } |
| 996 | result.config.thlds = mp_thresholds_set_crit(result.config.thlds, critical_range.range); | 996 | result.config.thlds = mp_thresholds_set_crit(result.config.thlds, critical_range.range); |
| @@ -999,7 +999,7 @@ check_curl_config_wrapper process_arguments(int argc, char **argv) { | |||
| 999 | { | 999 | { |
| 1000 | mp_range_parsed warning_range = mp_parse_range_string(optarg); | 1000 | mp_range_parsed warning_range = mp_parse_range_string(optarg); |
| 1001 | 1001 | ||
| 1002 | if (warning_range.error != MP_PARSING_SUCCES) { | 1002 | if (warning_range.error != MP_PARSING_SUCCESS) { |
| 1003 | die(STATE_UNKNOWN, "failed to parse warning threshold: %s", optarg); | 1003 | die(STATE_UNKNOWN, "failed to parse warning threshold: %s", optarg); |
| 1004 | } | 1004 | } |
| 1005 | result.config.thlds = mp_thresholds_set_warn(result.config.thlds, warning_range.range); | 1005 | result.config.thlds = mp_thresholds_set_warn(result.config.thlds, warning_range.range); |
| @@ -1275,7 +1275,7 @@ check_curl_config_wrapper process_arguments(int argc, char **argv) { | |||
| 1275 | { | 1275 | { |
| 1276 | mp_range_parsed foo = mp_parse_range_string(optarg); | 1276 | mp_range_parsed foo = mp_parse_range_string(optarg); |
| 1277 | 1277 | ||
| 1278 | if (foo.error != MP_PARSING_SUCCES) { | 1278 | if (foo.error != MP_PARSING_SUCCESS) { |
| 1279 | die(STATE_CRITICAL, "failed to parse page size limits: %s", optarg); | 1279 | die(STATE_CRITICAL, "failed to parse page size limits: %s", optarg); |
| 1280 | } | 1280 | } |
| 1281 | 1281 | ||
diff --git a/plugins/check_dbi.c b/plugins/check_dbi.c index 81d92952..dd466d00 100644 --- a/plugins/check_dbi.c +++ b/plugins/check_dbi.c | |||
| @@ -470,7 +470,7 @@ check_dbi_config_wrapper process_arguments(int argc, char **argv) { | |||
| 470 | 470 | ||
| 471 | case 'c': /* critical range */ { | 471 | case 'c': /* critical range */ { |
| 472 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 472 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 473 | if (tmp.error != MP_PARSING_SUCCES) { | 473 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 474 | die(STATE_UNKNOWN, "failed to parse critical threshold"); | 474 | die(STATE_UNKNOWN, "failed to parse critical threshold"); |
| 475 | } | 475 | } |
| 476 | result.config.thresholds = mp_thresholds_set_crit(result.config.thresholds, tmp.range); | 476 | result.config.thresholds = mp_thresholds_set_crit(result.config.thresholds, tmp.range); |
| @@ -478,7 +478,7 @@ check_dbi_config_wrapper process_arguments(int argc, char **argv) { | |||
| 478 | } break; | 478 | } break; |
| 479 | case 'w': /* warning range */ { | 479 | case 'w': /* warning range */ { |
| 480 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 480 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 481 | if (tmp.error != MP_PARSING_SUCCES) { | 481 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 482 | die(STATE_UNKNOWN, "failed to parse warning threshold"); | 482 | die(STATE_UNKNOWN, "failed to parse warning threshold"); |
| 483 | } | 483 | } |
| 484 | result.config.thresholds = mp_thresholds_set_warn(result.config.thresholds, tmp.range); | 484 | result.config.thresholds = mp_thresholds_set_warn(result.config.thresholds, tmp.range); |
diff --git a/plugins/check_disk.c b/plugins/check_disk.c index e1a2baff..0d941f25 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c | |||
| @@ -838,7 +838,7 @@ check_disk_config_wrapper process_arguments(int argc, char **argv) { | |||
| 838 | } | 838 | } |
| 839 | char *range = argv[index++]; | 839 | char *range = argv[index++]; |
| 840 | mp_range_parsed tmp = mp_parse_range_string(range); | 840 | mp_range_parsed tmp = mp_parse_range_string(range); |
| 841 | if (tmp.error != MP_PARSING_SUCCES) { | 841 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 842 | die(STATE_UNKNOWN, "failed to parse warning threshold"); | 842 | die(STATE_UNKNOWN, "failed to parse warning threshold"); |
| 843 | } | 843 | } |
| 844 | 844 | ||
| @@ -859,7 +859,7 @@ check_disk_config_wrapper process_arguments(int argc, char **argv) { | |||
| 859 | } | 859 | } |
| 860 | char *range = argv[index++]; | 860 | char *range = argv[index++]; |
| 861 | mp_range_parsed tmp = mp_parse_range_string(range); | 861 | mp_range_parsed tmp = mp_parse_range_string(range); |
| 862 | if (tmp.error != MP_PARSING_SUCCES) { | 862 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 863 | die(STATE_UNKNOWN, "failed to parse warning threshold"); | 863 | die(STATE_UNKNOWN, "failed to parse warning threshold"); |
| 864 | } | 864 | } |
| 865 | 865 | ||
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c index 333dae41..7f8282b4 100644 --- a/plugins/check_ldap.c +++ b/plugins/check_ldap.c | |||
| @@ -400,7 +400,7 @@ check_ldap_config_wrapper process_arguments(int argc, char **argv) { | |||
| 400 | break; | 400 | break; |
| 401 | case 'w': { | 401 | case 'w': { |
| 402 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 402 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 403 | if (tmp.error != MP_PARSING_SUCCES) { | 403 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 404 | die(STATE_UNKNOWN, "failed to parse warning connection time threshold"); | 404 | die(STATE_UNKNOWN, "failed to parse warning connection time threshold"); |
| 405 | } | 405 | } |
| 406 | result.config.connection_time_threshold = | 406 | result.config.connection_time_threshold = |
| @@ -408,7 +408,7 @@ check_ldap_config_wrapper process_arguments(int argc, char **argv) { | |||
| 408 | } break; | 408 | } break; |
| 409 | case 'c': { | 409 | case 'c': { |
| 410 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 410 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 411 | if (tmp.error != MP_PARSING_SUCCES) { | 411 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 412 | die(STATE_UNKNOWN, "failed to parse critical connection time threshold"); | 412 | die(STATE_UNKNOWN, "failed to parse critical connection time threshold"); |
| 413 | } | 413 | } |
| 414 | result.config.connection_time_threshold = | 414 | result.config.connection_time_threshold = |
| @@ -416,7 +416,7 @@ check_ldap_config_wrapper process_arguments(int argc, char **argv) { | |||
| 416 | } break; | 416 | } break; |
| 417 | case 'W': { | 417 | case 'W': { |
| 418 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 418 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 419 | if (tmp.error != MP_PARSING_SUCCES) { | 419 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 420 | die(STATE_UNKNOWN, "failed to parse number of entries warning threshold"); | 420 | die(STATE_UNKNOWN, "failed to parse number of entries warning threshold"); |
| 421 | } | 421 | } |
| 422 | result.config.entries_thresholds = | 422 | result.config.entries_thresholds = |
| @@ -424,7 +424,7 @@ check_ldap_config_wrapper process_arguments(int argc, char **argv) { | |||
| 424 | } break; | 424 | } break; |
| 425 | case 'C': { | 425 | case 'C': { |
| 426 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 426 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 427 | if (tmp.error != MP_PARSING_SUCCES) { | 427 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 428 | die(STATE_UNKNOWN, "failed to parse number of entries critical threshold"); | 428 | die(STATE_UNKNOWN, "failed to parse number of entries critical threshold"); |
| 429 | } | 429 | } |
| 430 | result.config.entries_thresholds = | 430 | result.config.entries_thresholds = |
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c index cdc2a035..bb38fcc5 100644 --- a/plugins/check_mrtg.c +++ b/plugins/check_mrtg.c | |||
| @@ -255,7 +255,7 @@ check_mrtg_config_wrapper process_arguments(int argc, char **argv) { | |||
| 255 | break; | 255 | break; |
| 256 | case 'w': /* critical time threshold */ { | 256 | case 'w': /* critical time threshold */ { |
| 257 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 257 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 258 | if (tmp.error != MP_PARSING_SUCCES) { | 258 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 259 | die(STATE_UNKNOWN, "failed to parse warning threshold"); | 259 | die(STATE_UNKNOWN, "failed to parse warning threshold"); |
| 260 | } | 260 | } |
| 261 | result.config.values_threshold = | 261 | result.config.values_threshold = |
| @@ -263,7 +263,7 @@ check_mrtg_config_wrapper process_arguments(int argc, char **argv) { | |||
| 263 | } break; | 263 | } break; |
| 264 | case 'c': /* warning time threshold */ { | 264 | case 'c': /* warning time threshold */ { |
| 265 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 265 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 266 | if (tmp.error != MP_PARSING_SUCCES) { | 266 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 267 | die(STATE_UNKNOWN, "failed to parse critical threshold"); | 267 | die(STATE_UNKNOWN, "failed to parse critical threshold"); |
| 268 | } | 268 | } |
| 269 | result.config.values_threshold = | 269 | result.config.values_threshold = |
| @@ -330,7 +330,7 @@ check_mrtg_config_wrapper process_arguments(int argc, char **argv) { | |||
| 330 | 330 | ||
| 331 | if (argc > option_char && !result.config.values_threshold.warning_is_set) { | 331 | if (argc > option_char && !result.config.values_threshold.warning_is_set) { |
| 332 | mp_range_parsed tmp = mp_parse_range_string(argv[option_char++]); | 332 | mp_range_parsed tmp = mp_parse_range_string(argv[option_char++]); |
| 333 | if (tmp.error != MP_PARSING_SUCCES) { | 333 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 334 | die(STATE_UNKNOWN, "failed to parse warning threshold"); | 334 | die(STATE_UNKNOWN, "failed to parse warning threshold"); |
| 335 | } | 335 | } |
| 336 | result.config.values_threshold = | 336 | result.config.values_threshold = |
| @@ -339,7 +339,7 @@ check_mrtg_config_wrapper process_arguments(int argc, char **argv) { | |||
| 339 | 339 | ||
| 340 | if (argc > option_char && !result.config.values_threshold.critical_is_set) { | 340 | if (argc > option_char && !result.config.values_threshold.critical_is_set) { |
| 341 | mp_range_parsed tmp = mp_parse_range_string(argv[option_char++]); | 341 | mp_range_parsed tmp = mp_parse_range_string(argv[option_char++]); |
| 342 | if (tmp.error != MP_PARSING_SUCCES) { | 342 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 343 | die(STATE_UNKNOWN, "failed to parse critical threshold"); | 343 | die(STATE_UNKNOWN, "failed to parse critical threshold"); |
| 344 | } | 344 | } |
| 345 | result.config.values_threshold = | 345 | result.config.values_threshold = |
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c index 26730d4c..15005bf5 100644 --- a/plugins/check_mysql.c +++ b/plugins/check_mysql.c | |||
| @@ -572,7 +572,7 @@ check_mysql_config_wrapper process_arguments(int argc, char **argv) { | |||
| 572 | break; | 572 | break; |
| 573 | case 'w': { | 573 | case 'w': { |
| 574 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 574 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 575 | if (tmp.error != MP_PARSING_SUCCES) { | 575 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 576 | die(STATE_UNKNOWN, "failed to parse warning time threshold"); | 576 | die(STATE_UNKNOWN, "failed to parse warning time threshold"); |
| 577 | } | 577 | } |
| 578 | result.config.replica_thresholds = | 578 | result.config.replica_thresholds = |
| @@ -580,7 +580,7 @@ check_mysql_config_wrapper process_arguments(int argc, char **argv) { | |||
| 580 | } break; | 580 | } break; |
| 581 | case 'c': { | 581 | case 'c': { |
| 582 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 582 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 583 | if (tmp.error != MP_PARSING_SUCCES) { | 583 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 584 | die(STATE_UNKNOWN, "failed to parse critical time threshold"); | 584 | die(STATE_UNKNOWN, "failed to parse critical time threshold"); |
| 585 | } | 585 | } |
| 586 | result.config.replica_thresholds = | 586 | result.config.replica_thresholds = |
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c index ae6cc15d..fc0966d3 100644 --- a/plugins/check_mysql_query.c +++ b/plugins/check_mysql_query.c | |||
| @@ -277,14 +277,14 @@ check_mysql_query_config_wrapper process_arguments(int argc, char **argv) { | |||
| 277 | break; | 277 | break; |
| 278 | case 'w': { | 278 | case 'w': { |
| 279 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 279 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 280 | if (tmp.error != MP_PARSING_SUCCES) { | 280 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 281 | die(STATE_UNKNOWN, "failed to parse warning threshold"); | 281 | die(STATE_UNKNOWN, "failed to parse warning threshold"); |
| 282 | } | 282 | } |
| 283 | result.config.thresholds = mp_thresholds_set_warn(result.config.thresholds, tmp.range); | 283 | result.config.thresholds = mp_thresholds_set_warn(result.config.thresholds, tmp.range); |
| 284 | } break; | 284 | } break; |
| 285 | case 'c': { | 285 | case 'c': { |
| 286 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 286 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 287 | if (tmp.error != MP_PARSING_SUCCES) { | 287 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 288 | die(STATE_UNKNOWN, "failed to parse critical threshold"); | 288 | die(STATE_UNKNOWN, "failed to parse critical threshold"); |
| 289 | } | 289 | } |
| 290 | result.config.thresholds = mp_thresholds_set_crit(result.config.thresholds, tmp.range); | 290 | result.config.thresholds = mp_thresholds_set_crit(result.config.thresholds, tmp.range); |
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c index 06737a27..b5cfb460 100644 --- a/plugins/check_ntp_peer.c +++ b/plugins/check_ntp_peer.c | |||
| @@ -548,7 +548,7 @@ check_ntp_peer_config_wrapper process_arguments(int argc, char **argv) { | |||
| 548 | break; | 548 | break; |
| 549 | case 'w': { | 549 | case 'w': { |
| 550 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 550 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 551 | if (tmp.error != MP_PARSING_SUCCES) { | 551 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 552 | die(STATE_UNKNOWN, "failed to parse warning offset threshold"); | 552 | die(STATE_UNKNOWN, "failed to parse warning offset threshold"); |
| 553 | } | 553 | } |
| 554 | 554 | ||
| @@ -557,7 +557,7 @@ check_ntp_peer_config_wrapper process_arguments(int argc, char **argv) { | |||
| 557 | } break; | 557 | } break; |
| 558 | case 'c': { | 558 | case 'c': { |
| 559 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 559 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 560 | if (tmp.error != MP_PARSING_SUCCES) { | 560 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 561 | die(STATE_UNKNOWN, "failed to parse critical offset threshold"); | 561 | die(STATE_UNKNOWN, "failed to parse critical offset threshold"); |
| 562 | } | 562 | } |
| 563 | 563 | ||
| @@ -567,7 +567,7 @@ check_ntp_peer_config_wrapper process_arguments(int argc, char **argv) { | |||
| 567 | case 'W': { | 567 | case 'W': { |
| 568 | result.config.do_stratum = true; | 568 | result.config.do_stratum = true; |
| 569 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 569 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 570 | if (tmp.error != MP_PARSING_SUCCES) { | 570 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 571 | die(STATE_UNKNOWN, "failed to parse warning stratum threshold"); | 571 | die(STATE_UNKNOWN, "failed to parse warning stratum threshold"); |
| 572 | } | 572 | } |
| 573 | 573 | ||
| @@ -577,7 +577,7 @@ check_ntp_peer_config_wrapper process_arguments(int argc, char **argv) { | |||
| 577 | case 'C': { | 577 | case 'C': { |
| 578 | result.config.do_stratum = true; | 578 | result.config.do_stratum = true; |
| 579 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 579 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 580 | if (tmp.error != MP_PARSING_SUCCES) { | 580 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 581 | die(STATE_UNKNOWN, "failed to parse critical stratum threshold"); | 581 | die(STATE_UNKNOWN, "failed to parse critical stratum threshold"); |
| 582 | } | 582 | } |
| 583 | 583 | ||
| @@ -587,7 +587,7 @@ check_ntp_peer_config_wrapper process_arguments(int argc, char **argv) { | |||
| 587 | case 'j': { | 587 | case 'j': { |
| 588 | result.config.do_jitter = true; | 588 | result.config.do_jitter = true; |
| 589 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 589 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 590 | if (tmp.error != MP_PARSING_SUCCES) { | 590 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 591 | die(STATE_UNKNOWN, "failed to parse warning jitter threshold"); | 591 | die(STATE_UNKNOWN, "failed to parse warning jitter threshold"); |
| 592 | } | 592 | } |
| 593 | 593 | ||
| @@ -597,7 +597,7 @@ check_ntp_peer_config_wrapper process_arguments(int argc, char **argv) { | |||
| 597 | case 'k': { | 597 | case 'k': { |
| 598 | result.config.do_jitter = true; | 598 | result.config.do_jitter = true; |
| 599 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 599 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 600 | if (tmp.error != MP_PARSING_SUCCES) { | 600 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 601 | die(STATE_UNKNOWN, "failed to parse critical jitter threshold"); | 601 | die(STATE_UNKNOWN, "failed to parse critical jitter threshold"); |
| 602 | } | 602 | } |
| 603 | 603 | ||
| @@ -607,7 +607,7 @@ check_ntp_peer_config_wrapper process_arguments(int argc, char **argv) { | |||
| 607 | case 'm': { | 607 | case 'm': { |
| 608 | result.config.do_truechimers = true; | 608 | result.config.do_truechimers = true; |
| 609 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 609 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 610 | if (tmp.error != MP_PARSING_SUCCES) { | 610 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 611 | die(STATE_UNKNOWN, "failed to parse warning truechimer threshold"); | 611 | die(STATE_UNKNOWN, "failed to parse warning truechimer threshold"); |
| 612 | } | 612 | } |
| 613 | 613 | ||
| @@ -617,7 +617,7 @@ check_ntp_peer_config_wrapper process_arguments(int argc, char **argv) { | |||
| 617 | case 'n': { | 617 | case 'n': { |
| 618 | result.config.do_truechimers = true; | 618 | result.config.do_truechimers = true; |
| 619 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 619 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 620 | if (tmp.error != MP_PARSING_SUCCES) { | 620 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 621 | die(STATE_UNKNOWN, "failed to parse critical truechimer threshold"); | 621 | die(STATE_UNKNOWN, "failed to parse critical truechimer threshold"); |
| 622 | } | 622 | } |
| 623 | 623 | ||
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c index 5955d22e..4e3a55db 100644 --- a/plugins/check_ntp_time.c +++ b/plugins/check_ntp_time.c | |||
| @@ -605,7 +605,7 @@ static check_ntp_time_config_wrapper process_arguments(int argc, char **argv) { | |||
| 605 | break; | 605 | break; |
| 606 | case 'w': { | 606 | case 'w': { |
| 607 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 607 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 608 | if (tmp.error != MP_PARSING_SUCCES) { | 608 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 609 | die(STATE_UNKNOWN, "failed to parse warning threshold"); | 609 | die(STATE_UNKNOWN, "failed to parse warning threshold"); |
| 610 | } | 610 | } |
| 611 | 611 | ||
| @@ -614,7 +614,7 @@ static check_ntp_time_config_wrapper process_arguments(int argc, char **argv) { | |||
| 614 | } break; | 614 | } break; |
| 615 | case 'c': { | 615 | case 'c': { |
| 616 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 616 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 617 | if (tmp.error != MP_PARSING_SUCCES) { | 617 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 618 | die(STATE_UNKNOWN, "failed to parse crit threshold"); | 618 | die(STATE_UNKNOWN, "failed to parse crit threshold"); |
| 619 | } | 619 | } |
| 620 | 620 | ||
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c index 0ce75e0a..8cbaaeeb 100644 --- a/plugins/check_pgsql.c +++ b/plugins/check_pgsql.c | |||
| @@ -401,7 +401,7 @@ static check_pgsql_config_wrapper process_arguments(int argc, char **argv) { | |||
| 401 | break; | 401 | break; |
| 402 | case 'c': /* critical time threshold */ { | 402 | case 'c': /* critical time threshold */ { |
| 403 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 403 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 404 | if (tmp.error != MP_PARSING_SUCCES) { | 404 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 405 | die(STATE_UNKNOWN, "failed to parse critical time threshold"); | 405 | die(STATE_UNKNOWN, "failed to parse critical time threshold"); |
| 406 | } | 406 | } |
| 407 | result.config.time_thresholds = | 407 | result.config.time_thresholds = |
| @@ -409,7 +409,7 @@ static check_pgsql_config_wrapper process_arguments(int argc, char **argv) { | |||
| 409 | } break; | 409 | } break; |
| 410 | case 'w': /* warning time threshold */ { | 410 | case 'w': /* warning time threshold */ { |
| 411 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 411 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 412 | if (tmp.error != MP_PARSING_SUCCES) { | 412 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 413 | die(STATE_UNKNOWN, "failed to parse warning time threshold"); | 413 | die(STATE_UNKNOWN, "failed to parse warning time threshold"); |
| 414 | } | 414 | } |
| 415 | result.config.time_thresholds = | 415 | result.config.time_thresholds = |
| @@ -417,7 +417,7 @@ static check_pgsql_config_wrapper process_arguments(int argc, char **argv) { | |||
| 417 | } break; | 417 | } break; |
| 418 | case 'C': /* critical query threshold */ { | 418 | case 'C': /* critical query threshold */ { |
| 419 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 419 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 420 | if (tmp.error != MP_PARSING_SUCCES) { | 420 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 421 | die(STATE_UNKNOWN, "failed to parse critical query threshold"); | 421 | die(STATE_UNKNOWN, "failed to parse critical query threshold"); |
| 422 | } | 422 | } |
| 423 | 423 | ||
| @@ -427,7 +427,7 @@ static check_pgsql_config_wrapper process_arguments(int argc, char **argv) { | |||
| 427 | } break; | 427 | } break; |
| 428 | case 'W': /* warning query threshold */ { | 428 | case 'W': /* warning query threshold */ { |
| 429 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 429 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 430 | if (tmp.error != MP_PARSING_SUCCES) { | 430 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 431 | die(STATE_UNKNOWN, "failed to parse warning query threshold"); | 431 | die(STATE_UNKNOWN, "failed to parse warning query threshold"); |
| 432 | } | 432 | } |
| 433 | result.config.qthresholds = | 433 | result.config.qthresholds = |
diff --git a/plugins/check_real.c b/plugins/check_real.c index 15c8a20c..b415578f 100644 --- a/plugins/check_real.c +++ b/plugins/check_real.c | |||
| @@ -409,7 +409,7 @@ check_real_config_wrapper process_arguments(int argc, char **argv) { | |||
| 409 | case 'w': /* warning time threshold */ | 409 | case 'w': /* warning time threshold */ |
| 410 | { | 410 | { |
| 411 | mp_range_parsed critical_range = mp_parse_range_string(optarg); | 411 | mp_range_parsed critical_range = mp_parse_range_string(optarg); |
| 412 | if (critical_range.error != MP_PARSING_SUCCES) { | 412 | if (critical_range.error != MP_PARSING_SUCCESS) { |
| 413 | die(STATE_UNKNOWN, "failed to parse warning threshold: %s", optarg); | 413 | die(STATE_UNKNOWN, "failed to parse warning threshold: %s", optarg); |
| 414 | } | 414 | } |
| 415 | result.config.time_thresholds = | 415 | result.config.time_thresholds = |
| @@ -418,7 +418,7 @@ check_real_config_wrapper process_arguments(int argc, char **argv) { | |||
| 418 | case 'c': /* critical time threshold */ | 418 | case 'c': /* critical time threshold */ |
| 419 | { | 419 | { |
| 420 | mp_range_parsed critical_range = mp_parse_range_string(optarg); | 420 | mp_range_parsed critical_range = mp_parse_range_string(optarg); |
| 421 | if (critical_range.error != MP_PARSING_SUCCES) { | 421 | if (critical_range.error != MP_PARSING_SUCCESS) { |
| 422 | die(STATE_UNKNOWN, "failed to parse critical threshold: %s", optarg); | 422 | die(STATE_UNKNOWN, "failed to parse critical threshold: %s", optarg); |
| 423 | } | 423 | } |
| 424 | result.config.time_thresholds = | 424 | result.config.time_thresholds = |
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index 701af7b0..24883fd8 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c | |||
| @@ -735,7 +735,7 @@ check_smtp_config_wrapper process_arguments(int argc, char **argv) { | |||
| 735 | break; | 735 | break; |
| 736 | case 'c': /* critical time threshold */ { | 736 | case 'c': /* critical time threshold */ { |
| 737 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 737 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 738 | if (tmp.error != MP_PARSING_SUCCES) { | 738 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 739 | die(STATE_UNKNOWN, "failed to parse critical time threshold"); | 739 | die(STATE_UNKNOWN, "failed to parse critical time threshold"); |
| 740 | } | 740 | } |
| 741 | result.config.connection_time = | 741 | result.config.connection_time = |
| @@ -743,7 +743,7 @@ check_smtp_config_wrapper process_arguments(int argc, char **argv) { | |||
| 743 | } break; | 743 | } break; |
| 744 | case 'w': /* warning time threshold */ { | 744 | case 'w': /* warning time threshold */ { |
| 745 | mp_range_parsed tmp = mp_parse_range_string(optarg); | 745 | mp_range_parsed tmp = mp_parse_range_string(optarg); |
| 746 | if (tmp.error != MP_PARSING_SUCCES) { | 746 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 747 | die(STATE_UNKNOWN, "failed to parse warning time threshold"); | 747 | die(STATE_UNKNOWN, "failed to parse warning time threshold"); |
| 748 | } | 748 | } |
| 749 | result.config.connection_time = | 749 | result.config.connection_time = |
diff --git a/plugins/check_snmp.d/check_snmp_helpers.c b/plugins/check_snmp.d/check_snmp_helpers.c index 2dfc88b5..83e94a34 100644 --- a/plugins/check_snmp.d/check_snmp_helpers.c +++ b/plugins/check_snmp.d/check_snmp_helpers.c | |||
| @@ -52,7 +52,7 @@ int check_snmp_set_thresholds(const char *threshold_string, check_snmp_test_unit | |||
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | mp_range_parsed tmp = mp_parse_range_string(ptr); | 54 | mp_range_parsed tmp = mp_parse_range_string(ptr); |
| 55 | if (tmp.error != MP_PARSING_SUCCES) { | 55 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 56 | die(STATE_UNKNOWN, "Unable to parse critical threshold range: %s", ptr); | 56 | die(STATE_UNKNOWN, "Unable to parse critical threshold range: %s", ptr); |
| 57 | } | 57 | } |
| 58 | 58 | ||
| @@ -70,7 +70,7 @@ int check_snmp_set_thresholds(const char *threshold_string, check_snmp_test_unit | |||
| 70 | // Single value | 70 | // Single value |
| 71 | // only valid for the first test unit | 71 | // only valid for the first test unit |
| 72 | mp_range_parsed tmp = mp_parse_range_string(threshold_string); | 72 | mp_range_parsed tmp = mp_parse_range_string(threshold_string); |
| 73 | if (tmp.error != MP_PARSING_SUCCES) { | 73 | if (tmp.error != MP_PARSING_SUCCESS) { |
| 74 | die(STATE_UNKNOWN, "Unable to parse critical threshold range: %s", threshold_string); | 74 | die(STATE_UNKNOWN, "Unable to parse critical threshold range: %s", threshold_string); |
| 75 | } | 75 | } |
| 76 | 76 | ||
diff --git a/plugins/check_users.c b/plugins/check_users.c index 3b2e265e..4027d21a 100644 --- a/plugins/check_users.c +++ b/plugins/check_users.c | |||
| @@ -222,7 +222,7 @@ check_users_config_wrapper process_arguments(int argc, char **argv) { | |||
| 222 | exit(STATE_UNKNOWN); | 222 | exit(STATE_UNKNOWN); |
| 223 | } | 223 | } |
| 224 | 224 | ||
| 225 | if (tmp.error == MP_PARSING_SUCCES) { | 225 | if (tmp.error == MP_PARSING_SUCCESS) { |
| 226 | result.config.thresholds.warning = tmp.range; | 226 | result.config.thresholds.warning = tmp.range; |
| 227 | result.config.thresholds.warning_is_set = true; | 227 | result.config.thresholds.warning_is_set = true; |
| 228 | } else { | 228 | } else { |
| @@ -238,7 +238,7 @@ check_users_config_wrapper process_arguments(int argc, char **argv) { | |||
| 238 | exit(STATE_UNKNOWN); | 238 | exit(STATE_UNKNOWN); |
| 239 | } | 239 | } |
| 240 | 240 | ||
| 241 | if (tmp.error == MP_PARSING_SUCCES) { | 241 | if (tmp.error == MP_PARSING_SUCCESS) { |
| 242 | result.config.thresholds.critical = tmp.range; | 242 | result.config.thresholds.critical = tmp.range; |
| 243 | result.config.thresholds.critical_is_set = true; | 243 | result.config.thresholds.critical_is_set = true; |
| 244 | } else { | 244 | } else { |
