X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ffilecount.c;h=47f99e91c8e3df2a502208ba6f99f6596afe10e1;hb=070563c1ac6bf489cb13095ed30a6d290b98ac75;hp=9f6ea564bf8c2624df27f9844f98f5a524aa5b14;hpb=856a68d51bae3f76f54b7b056e83ca8801223d90;p=collectd.git diff --git a/src/filecount.c b/src/filecount.c index 9f6ea564..47f99e91 100644 --- a/src/filecount.c +++ b/src/filecount.c @@ -478,10 +478,8 @@ static int fc_read_dir_callback (const char *dirname, const char *filename, if (S_ISDIR (statbuf.st_mode) && (dir->options & FC_RECURSIVE)) { - if(dir->options & FC_HIDDEN) - status = walk_directory (abs_path, fc_read_dir_callback, dir,/* include hidden */1); - else - status = walk_directory (abs_path, fc_read_dir_callback, dir,/* include hidden */ 0); + status = walk_directory (abs_path, fc_read_dir_callback, dir, + /* include hidden = */ (dir->options & FC_HIDDEN) ? 1 : 0); return (status); } else if (!S_ISREG (statbuf.st_mode)) @@ -544,10 +542,8 @@ static int fc_read_dir (fc_directory_conf_t *dir) if (dir->mtime != 0) dir->now = time (NULL); - if(dir->options & FC_HIDDEN) - status = walk_directory (dir->path, fc_read_dir_callback, dir,/* include hidden */ 1); - else - status = walk_directory (dir->path, fc_read_dir_callback, dir,/* include hidden */ 0); + status = walk_directory (dir->path, fc_read_dir_callback, dir, + /* include hidden */ (dir->options & FC_HIDDEN) ? 1 : 0); if (status != 0) { WARNING ("filecount plugin: walk_directory (%s) failed.", dir->path);