diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-08-31 18:26:16 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-09-01 12:10:07 +0200 |
| commit | b2c30136dce9d9cb14afc1431f83b8e4bf75ee0a (patch) | |
| tree | b613464e726cddc189c9ff181ede8209210c0c11 /src | |
| parent | e3b14643f49573b23f707e124374e0065119a3e6 (diff) | |
| download | coreutils-b2c30136dce9d9cb14afc1431f83b8e4bf75ee0a.tar.xz | |
maint: chown, chgrp, chmod, chcon: remove unnecessary initialization
* src/chown-core.c: Include "ignore-value.h".
(change_file_owner): Don't set "ent" only to ignore it.
* src/chcon.c (process_file): Likewise.
* src/chmod.c: Include "ignore-value.h".
(process_file): Don't set "ent" only to ignore it.
After diagnosing root-dev/ino failure, return false immediately:
Now that we don't set "ent" we must be sure not to use it uninitialized,
and there's no point in issuing --verbose-related output in this case.
Diffstat (limited to 'src')
| -rw-r--r-- | src/chcon.c | 3 | ||||
| -rw-r--r-- | src/chmod.c | 5 | ||||
| -rw-r--r-- | src/chown-core.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/chcon.c b/src/chcon.c index 266260066..531ed7a0d 100644 --- a/src/chcon.c +++ b/src/chcon.c @@ -22,6 +22,7 @@ #include "system.h" #include "dev-ino.h" #include "error.h" +#include "ignore-value.h" #include "quote.h" #include "quotearg.h" #include "root-dev-ino.h" @@ -225,7 +226,7 @@ process_file (FTS *fts, FTSENT *ent) /* Tell fts not to traverse into this hierarchy. */ fts_set (fts, ent, FTS_SKIP); /* Ensure that we do not process "/" on the second visit. */ - ent = fts_read (fts); + ignore_ptr (fts_read (fts)); return false; } return true; diff --git a/src/chmod.c b/src/chmod.c index 0e39c8b01..aeefcc65a 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -25,6 +25,7 @@ #include "dev-ino.h" #include "error.h" #include "filemode.h" +#include "ignore-value.h" #include "modechange.h" #include "quote.h" #include "quotearg.h" @@ -238,8 +239,8 @@ process_file (FTS *fts, FTSENT *ent) /* Tell fts not to traverse into this hierarchy. */ fts_set (fts, ent, FTS_SKIP); /* Ensure that we do not process "/" on the second visit. */ - ent = fts_read (fts); - ok = false; + ignore_ptr (fts_read (fts)); + return false; } if (ok) diff --git a/src/chown-core.c b/src/chown-core.c index 7e5774ee1..eb349049e 100644 --- a/src/chown-core.c +++ b/src/chown-core.c @@ -25,6 +25,7 @@ #include "system.h" #include "chown-core.h" #include "error.h" +#include "ignore-value.h" #include "quote.h" #include "root-dev-ino.h" #include "xfts.h" @@ -270,7 +271,7 @@ change_file_owner (FTS *fts, FTSENT *ent, /* Tell fts not to traverse into this hierarchy. */ fts_set (fts, ent, FTS_SKIP); /* Ensure that we do not process "/" on the second visit. */ - ent = fts_read (fts); + ignore_ptr (fts_read (fts)); return false; } return true; |