diff options
| author | Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> | 2026-01-09 13:05:25 +0100 |
|---|---|---|
| committer | Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> | 2026-01-09 13:05:25 +0100 |
| commit | c1384375bc55c41bc79a1e1bcce57ffee263b52d (patch) | |
| tree | 6c20e786dbb7eeeaf792a9d095ac0e887e2cb08c /plugins/check_snmp.d | |
| parent | bfc6492562f6cef4badda192142a0d10a3ed870b (diff) | |
| download | monitoring-plugins-c1384375bc55c41bc79a1e1bcce57ffee263b52d.tar.gz | |
Fix some minor compiler warnings
Diffstat (limited to 'plugins/check_snmp.d')
| -rw-r--r-- | plugins/check_snmp.d/check_snmp_helpers.c | 10 | ||||
| -rw-r--r-- | plugins/check_snmp.d/check_snmp_helpers.h | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/plugins/check_snmp.d/check_snmp_helpers.c b/plugins/check_snmp.d/check_snmp_helpers.c index f506537a..2dfc88b5 100644 --- a/plugins/check_snmp.d/check_snmp_helpers.c +++ b/plugins/check_snmp.d/check_snmp_helpers.c | |||
| @@ -36,7 +36,8 @@ int check_snmp_set_thresholds(const char *threshold_string, check_snmp_test_unit | |||
| 36 | threshold_string++; | 36 | threshold_string++; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | for (char *ptr = strtok(threshold_string, ", "); ptr != NULL; | 39 | char *thr_string_copy = strdup(threshold_string); |
| 40 | for (char *ptr = strtok(thr_string_copy, ", "); ptr != NULL; | ||
| 40 | ptr = strtok(NULL, ", "), tu_index++) { | 41 | ptr = strtok(NULL, ", "), tu_index++) { |
| 41 | 42 | ||
| 42 | if (tu_index > max_test_units) { | 43 | if (tu_index > max_test_units) { |
| @@ -64,6 +65,7 @@ int check_snmp_set_thresholds(const char *threshold_string, check_snmp_test_unit | |||
| 64 | } | 65 | } |
| 65 | } | 66 | } |
| 66 | 67 | ||
| 68 | free(thr_string_copy); | ||
| 67 | } else { | 69 | } else { |
| 68 | // Single value | 70 | // Single value |
| 69 | // only valid for the first test unit | 71 | // only valid for the first test unit |
| @@ -843,8 +845,8 @@ char *_np_state_calculate_location_prefix(void) { | |||
| 843 | * Sets variables. Generates filename. Returns np_state_key. die with | 845 | * Sets variables. Generates filename. Returns np_state_key. die with |
| 844 | * UNKNOWN if exception | 846 | * UNKNOWN if exception |
| 845 | */ | 847 | */ |
| 846 | state_key np_enable_state(char *keyname, int expected_data_version, char *plugin_name, int argc, | 848 | state_key np_enable_state(char *keyname, int expected_data_version, const char *plugin_name, |
| 847 | char **argv) { | 849 | int argc, char **argv) { |
| 848 | state_key *this_state = (state_key *)calloc(1, sizeof(state_key)); | 850 | state_key *this_state = (state_key *)calloc(1, sizeof(state_key)); |
| 849 | if (this_state == NULL) { | 851 | if (this_state == NULL) { |
| 850 | die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno)); | 852 | die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno)); |
| @@ -869,7 +871,7 @@ state_key np_enable_state(char *keyname, int expected_data_version, char *plugin | |||
| 869 | tmp_char++; | 871 | tmp_char++; |
| 870 | } | 872 | } |
| 871 | this_state->name = temp_keyname; | 873 | this_state->name = temp_keyname; |
| 872 | this_state->plugin_name = plugin_name; | 874 | this_state->plugin_name = (char *)plugin_name; |
| 873 | this_state->data_version = expected_data_version; | 875 | this_state->data_version = expected_data_version; |
| 874 | this_state->state_data = NULL; | 876 | this_state->state_data = NULL; |
| 875 | 877 | ||
diff --git a/plugins/check_snmp.d/check_snmp_helpers.h b/plugins/check_snmp.d/check_snmp_helpers.h index 0f7780b1..95b361ac 100644 --- a/plugins/check_snmp.d/check_snmp_helpers.h +++ b/plugins/check_snmp.d/check_snmp_helpers.h | |||
| @@ -66,6 +66,6 @@ typedef struct state_key_struct { | |||
| 66 | } state_key; | 66 | } state_key; |
| 67 | 67 | ||
| 68 | state_data *np_state_read(state_key stateKey); | 68 | state_data *np_state_read(state_key stateKey); |
| 69 | state_key np_enable_state(char *keyname, int expected_data_version, char *plugin_name, int argc, | 69 | state_key np_enable_state(char *keyname, int expected_data_version, const char *plugin_name, |
| 70 | char **argv); | 70 | int argc, char **argv); |
| 71 | void np_state_write_string(state_key stateKey, time_t timestamp, char *stringToStore); | 71 | void np_state_write_string(state_key stateKey, time_t timestamp, char *stringToStore); |
