From f3e2a0e31338a081fe6b333262894f4fbac5f9d0 Mon Sep 17 00:00:00 2001 From: billf Date: Mon, 27 Sep 1999 00:36:03 +0000 Subject: -Wall fixes. Submitted by: nrahlstr --- usr.sbin/mtree/compare.c | 3 ++- usr.sbin/mtree/create.c | 6 ++++-- usr.sbin/mtree/verify.c | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'usr.sbin/mtree') diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c index 0f6adf6..d48db41 100644 --- a/usr.sbin/mtree/compare.c +++ b/usr.sbin/mtree/compare.c @@ -194,7 +194,7 @@ typeerr: LABEL; ctime(&p->fts_statp->st_mtimespec.tv_sec)); tab = "\t"; } - if (s->flags & F_CKSUM) + if (s->flags & F_CKSUM) { if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0) { LABEL; (void)printf("%scksum: %s: %s\n", @@ -215,6 +215,7 @@ typeerr: LABEL; } tab = "\t"; } + } #ifdef MD5 if (s->flags & F_MD5) { char *new_digest, buf[33]; diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c index 0986d844..6075099 100644 --- a/usr.sbin/mtree/create.c +++ b/usr.sbin/mtree/create.c @@ -320,22 +320,24 @@ statd(t, parent, puid, pgid, pmode) (void)printf("/set type=dir"); else (void)printf("/set type=file"); - if (keys & F_UNAME) + if (keys & F_UNAME) { if ((pw = getpwuid(saveuid)) != NULL) (void)printf(" uname=%s", pw->pw_name); else errx(1, "line %d: could not get uname for uid=%u", lineno, saveuid); + } if (keys & F_UID) (void)printf(" uid=%lu", (u_long)saveuid); - if (keys & F_GNAME) + if (keys & F_GNAME) { if ((gr = getgrgid(savegid)) != NULL) (void)printf(" gname=%s", gr->gr_name); else errx(1, "line %d: could not get gname for gid=%u", lineno, savegid); + } if (keys & F_GID) (void)printf(" gid=%lu", (u_long)savegid); if (keys & F_MODE) diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c index a04bd55..9b165cf 100644 --- a/usr.sbin/mtree/verify.c +++ b/usr.sbin/mtree/verify.c @@ -173,7 +173,7 @@ miss(p, tail) } create = 0; - if (!(p->flags & F_VISIT) && uflag) + if (!(p->flags & F_VISIT) && uflag) { if (!(p->flags & (F_UID | F_UNAME))) (void)printf(" (directory not created: user not specified)"); else if (!(p->flags & (F_GID | F_GNAME))) @@ -187,7 +187,7 @@ miss(p, tail) create = 1; (void)printf(" (created)"); } - + } if (!(p->flags & F_VISIT)) (void)putchar('\n'); -- cgit v1.1