summaryrefslogtreecommitdiffstats
path: root/bin/rm
diff options
context:
space:
mode:
authordillon <dillon@FreeBSD.org>2002-07-10 20:44:55 +0000
committerdillon <dillon@FreeBSD.org>2002-07-10 20:44:55 +0000
commit3adf63f81dde1ef0bfe13d1926aecb7453b2cfec (patch)
tree532d4c0413a4d4d483da0b70f7b88f1fad49506d /bin/rm
parentd5291af616cd93f5d0f49512296098b8f3ed246b (diff)
downloadFreeBSD-src-3adf63f81dde1ef0bfe13d1926aecb7453b2cfec.zip
FreeBSD-src-3adf63f81dde1ef0bfe13d1926aecb7453b2cfec.tar.gz
err() is documented as allowing NULL for the format string but GCC isn't
happy about it any more so change the usage to make buildworld work again.
Diffstat (limited to 'bin/rm')
-rw-r--r--bin/rm/rm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 3457454..4c79343 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -185,7 +185,7 @@ rm_tree(char **argv)
if (Wflag)
flags |= FTS_WHITEOUT;
if (!(fts = fts_open(argv, flags, NULL)))
- err(1, NULL);
+ err(1, "fts_open");
while ((p = fts_read(fts)) != NULL) {
switch (p->fts_info) {
case FTS_DNR:
@@ -436,7 +436,7 @@ check(char *path, char *name, struct stat *sp)
return (1);
strmode(sp->st_mode, modep);
if ((flagsp = fflagstostr(sp->st_flags)) == NULL)
- err(1, NULL);
+ err(1, "fflagstostr");
(void)fprintf(stderr, "override %s%s%s/%s %s%sfor %s? ",
modep + 1, modep[9] == ' ' ? "" : " ",
user_from_uid(sp->st_uid, 0),
OpenPOWER on IntegriCloud