summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1994-09-20 07:18:04 +0000
committerphk <phk@FreeBSD.org>1994-09-20 07:18:04 +0000
commit0969323e727a34e09e05eedab4efdb672bf08f7e (patch)
tree8363d890acee8bc7861564416f7e8b18a41da561 /bin
parent57f797253137eb37262dac72d9867ab2476480bc (diff)
downloadFreeBSD-src-0969323e727a34e09e05eedab4efdb672bf08f7e.zip
FreeBSD-src-0969323e727a34e09e05eedab4efdb672bf08f7e.tar.gz
Applied patch to make -Wall and -Dlint shut up.
Reviewed by: phk Submitted by: Josef Grosch <joeg@gagme.wwa.com>
Diffstat (limited to 'bin')
-rw-r--r--bin/rm/rm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 08016fd..f8ef83d 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -61,6 +61,8 @@ void rm_file __P((char **));
void rm_overwrite __P((char *, struct stat *));
void rm_tree __P((char **));
void usage __P((void));
+char *user_from_uid __P((uid_t, int));
+char *group_from_gid __P((gid_t, int));
/*
* rm --
@@ -202,7 +204,7 @@ rm_tree(argv)
} else {
if (Pflag)
rm_overwrite(p->fts_accpath, NULL);
- if (!unlink(p->fts_accpath) || fflag && errno == ENOENT)
+ if (!unlink(p->fts_accpath) || (fflag && errno == ENOENT))
continue;
}
warn("%s", p->fts_path);
@@ -344,7 +346,7 @@ check(path, name, sp)
return (first == 'y');
}
-#define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || (a)[1] == '.' && !(a)[2]))
+#define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2])))
void
checkdot(argv)
char **argv;
OpenPOWER on IntegriCloud