X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Fconfigfile.c;h=597779d1efd1b0e2425a740d953037e46c701a5d;hb=0b7cd83a5e6bac068ea83a88a5ddcfb07c09fbec;hp=0d295c1cbaf476d36682bef152457b19641ee599;hpb=4380983e0a45e2d1c1207dbea95863d1dcc844c6;p=collectd.git diff --git a/src/daemon/configfile.c b/src/daemon/configfile.c index 0d295c1c..597779d1 100644 --- a/src/daemon/configfile.c +++ b/src/daemon/configfile.c @@ -633,9 +633,7 @@ static oconfig_item_t *cf_read_dir(const char *dir, const char *pattern, dh = opendir(dir); if (dh == NULL) { - char errbuf[1024]; - ERROR("configfile: opendir failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("configfile: opendir failed: %s", STRERRNO); return NULL; } @@ -764,9 +762,7 @@ static oconfig_item_t *cf_read_generic(const char *path, const char *pattern, status = stat(path_ptr, &statbuf); if (status != 0) { - char errbuf[1024]; - WARNING("configfile: stat (%s) failed: %s", path_ptr, - sstrerror(errno, errbuf, sizeof(errbuf))); + WARNING("configfile: stat (%s) failed: %s", path_ptr, STRERRNO); continue; } @@ -812,9 +808,7 @@ static oconfig_item_t *cf_read_generic(const char *path, const char *pattern, status = stat(path, &statbuf); if (status != 0) { - char errbuf[1024]; - ERROR("configfile: stat (%s) failed: %s", path, - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("configfile: stat (%s) failed: %s", path, STRERRNO); return NULL; } @@ -874,7 +868,8 @@ const char *global_option_get(const char *option) { return NULL; } - return (cf_global_options[i].value != NULL) ? cf_global_options[i].value : cf_global_options[i].def; + return (cf_global_options[i].value != NULL) ? cf_global_options[i].value + : cf_global_options[i].def; } /* char *global_option_get */ long global_option_get_long(const char *option, long default_value) { @@ -1031,6 +1026,7 @@ int cf_read(const char *filename) { } return ret; + } /* int cf_read */ /* Assures the config option is a string, duplicates it and returns the copy in