diff options
author | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | 2008-11-19 06:45:18 +0000 |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | 2008-11-19 06:45:18 +0000 |
commit | caa8bd6423e2d0d1b4e72c150e80b9c6a9e1b7fe (patch) | |
tree | 118fd80cc8ba27ef695a8e8ce409e5d70f4fa451 /lib | |
parent | 16f53e0717b60660145388b0feb351628f606211 (diff) | |
download | monitoring-plugins-caa8bd6423e2d0d1b4e72c150e80b9c6a9e1b7fe.tar.gz |
Bulk EOL cleanup
$ git diff --ignore-space-change|diffstat
0 files changed
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2087 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'lib')
-rw-r--r-- | lib/parse_ini.c | 6 | ||||
-rw-r--r-- | lib/utils_base.c | 4 | ||||
-rw-r--r-- | lib/utils_disk.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/parse_ini.c b/lib/parse_ini.c index 57321753..c19952db 100644 --- a/lib/parse_ini.c +++ b/lib/parse_ini.c @@ -82,7 +82,7 @@ static void parse_locator(const char *locator, const char *def_stanza, np_ini_in } else { i->file=strdup(&(locator[stanza_len+1])); } - + if(i->file==NULL || i->stanza==NULL){ die(STATE_UNKNOWN, _("malloc() failed!\n")); } @@ -110,7 +110,7 @@ np_arg_list* np_get_defaults(const char *locator, const char *default_section){ if(inifile!=stdin) fclose(inifile); } free(i.stanza); - return defaults; + return defaults; } /* read_defaults is where the meat of the parsing takes place. @@ -161,7 +161,7 @@ static int read_defaults(FILE *f, const char *stanza, np_arg_list **opts){ default: switch(stanzastate){ /* we never found the start of the first stanza, so - * we're dealing with a config error + * we're dealing with a config error */ case NOSTANZA: die(STATE_UNKNOWN, _("Config file error")); diff --git a/lib/utils_base.c b/lib/utils_base.c index d1453c67..68f45675 100644 --- a/lib/utils_base.c +++ b/lib/utils_base.c @@ -89,7 +89,7 @@ range set_range_end(temp_range, end); } - if (temp_range->start_infinity == TRUE || + if (temp_range->start_infinity == TRUE || temp_range->end_infinity == TRUE || temp_range->start <= temp_range->end) { return temp_range; @@ -164,7 +164,7 @@ check_range(double value, range *my_range) { int no = FALSE; int yes = TRUE; - + if (my_range->alert_on == INSIDE) { no = TRUE; yes = FALSE; diff --git a/lib/utils_disk.c b/lib/utils_disk.c index 3ce4d47d..ba2b21d7 100644 --- a/lib/utils_disk.c +++ b/lib/utils_disk.c @@ -91,7 +91,7 @@ np_del_parameter(struct parameter_list *item, struct parameter_list *prev) return next; } - + /* returns a pointer to the struct found in the list */ struct parameter_list * np_find_parameter(struct parameter_list *list, const char *name) @@ -101,7 +101,7 @@ np_find_parameter(struct parameter_list *list, const char *name) if (! strcmp(temp_list->name, name)) return temp_list; } - + return NULL; } @@ -126,7 +126,7 @@ np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list if (! best_match) { for (me = mount_list; me; me = me->me_next) { size_t len = strlen (me->me_mountdir); - if ((exact == FALSE && (best_match_len <= len && len <= name_len && + if ((exact == FALSE && (best_match_len <= len && len <= name_len && (len == 1 || strncmp (me->me_mountdir, d->name, len) == 0))) || (exact == TRUE && strcmp(me->me_mountdir, d->name)==0)) { @@ -175,7 +175,7 @@ np_seen_name(struct name_list *list, const char *name) } int -np_regex_match_mount_entry (struct mount_entry* me, regex_t* re) +np_regex_match_mount_entry (struct mount_entry* me, regex_t* re) { if (regexec(re, me->me_devname, (size_t) 0, NULL, 0) == 0 || regexec(re, me->me_mountdir, (size_t) 0, NULL, 0) == 0 ) { |