diff options
author | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | 2008-02-13 11:05:44 +0000 |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | 2008-02-13 11:05:44 +0000 |
commit | fe2e5f4aecab99a1c361994e4b678d6709d65f6c (patch) | |
tree | 0278d52871abbe0682e1b807fd3af550807e4ff6 /plugins/check_disk.c | |
parent | 1ea6fedfc02e7885230f6c9cd6ffd429210f0f37 (diff) | |
download | monitoring-plugins-fe2e5f4aecab99a1c361994e4b678d6709d65f6c.tar.gz |
set_thresholds now let the user free the thresolds. (P.S.: When you set twice the thresholds for a path in check disk (like using -C followed by -p ) it overrides them. All new elements are created with np_add_parameter which initialises the thresholds to NULL.)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1930 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'plugins/check_disk.c')
-rw-r--r-- | plugins/check_disk.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 363879c6..29aec629 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c | |||
@@ -688,7 +688,7 @@ process_arguments (int argc, char **argv) | |||
688 | printf("ignoring %s matching regex\n", temp_list->name); | 688 | printf("ignoring %s matching regex\n", temp_list->name); |
689 | 689 | ||
690 | temp_list = np_del_parameter(temp_list, previous); | 690 | temp_list = np_del_parameter(temp_list, previous); |
691 | /* pointer to first element needs to be uΓΌdated if first item gets deleted */ | 691 | /* pointer to first element needs to be updated if first item gets deleted */ |
692 | if (previous == NULL) | 692 | if (previous == NULL) |
693 | path_select_list = temp_list; | 693 | path_select_list = temp_list; |
694 | } else { | 694 | } else { |
@@ -828,11 +828,17 @@ print_path (const char *mypath) | |||
828 | void | 828 | void |
829 | set_all_thresholds (struct parameter_list *path) | 829 | set_all_thresholds (struct parameter_list *path) |
830 | { | 830 | { |
831 | if (path->freespace_units != NULL) free(path->freespace_units); | ||
831 | set_thresholds(&path->freespace_units, warn_freespace_units, crit_freespace_units); | 832 | set_thresholds(&path->freespace_units, warn_freespace_units, crit_freespace_units); |
833 | if (path->freespace_percent != NULL) free (path->freespace_percent); | ||
832 | set_thresholds(&path->freespace_percent, warn_freespace_percent, crit_freespace_percent); | 834 | set_thresholds(&path->freespace_percent, warn_freespace_percent, crit_freespace_percent); |
835 | if (path->usedspace_units != NULL) free (path->usedspace_units); | ||
833 | set_thresholds(&path->usedspace_units, warn_usedspace_units, crit_usedspace_units); | 836 | set_thresholds(&path->usedspace_units, warn_usedspace_units, crit_usedspace_units); |
837 | if (path->usedspace_percent != NULL) free (path->usedspace_percent); | ||
834 | set_thresholds(&path->usedspace_percent, warn_usedspace_percent, crit_usedspace_percent); | 838 | set_thresholds(&path->usedspace_percent, warn_usedspace_percent, crit_usedspace_percent); |
839 | if (path->usedinodes_percent != NULL) free (path->usedinodes_percent); | ||
835 | set_thresholds(&path->usedinodes_percent, warn_usedinodes_percent, crit_usedinodes_percent); | 840 | set_thresholds(&path->usedinodes_percent, warn_usedinodes_percent, crit_usedinodes_percent); |
841 | if (path->freeinodes_percent != NULL) free (path->freeinodes_percent); | ||
836 | set_thresholds(&path->freeinodes_percent, warn_freeinodes_percent, crit_freeinodes_percent); | 842 | set_thresholds(&path->freeinodes_percent, warn_freeinodes_percent, crit_freeinodes_percent); |
837 | } | 843 | } |
838 | 844 | ||