projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
856a68d
)
filecount plugin: Use the ?:-operator for the hidden argument.
author
Florian Forster
<octo@huhu.verplant.org>
Fri, 25 Dec 2009 10:13:55 +0000
(11:13 +0100)
committer
Florian Forster
<octo@leeloo.lan.home.verplant.org>
Fri, 25 Dec 2009 22:15:28 +0000
(23:15 +0100)
src/filecount.c
patch
|
blob
|
history
diff --git
a/src/filecount.c
b/src/filecount.c
index
9f6ea56
..
47f99e9
100644
(file)
--- 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 (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))
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->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);
if (status != 0)
{
WARNING ("filecount plugin: walk_directory (%s) failed.", dir->path);