d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fts_pathlen is now a size_t rather than an int so a cast is needed.

Browse Source 
I'm not sure why warn() and err() string formatted variables need
to be right-justified.
This commit is contained in:
John Birrell 2008-01-27 01:19:47 +00:00
parent 4f3b854461
commit 91d55a13ee
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=175704
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/setfmac/setfmac.c
View File

@ -157,12 +157,12 @@ main(int argc, char **argv)
if (apply_specs(specs, ftsent, hflag, vflag)) {
if (eflag) {
errx(1, "labeling not supported in "
"%.*s", ftsent->fts_pathlen,
"%.*s", (int) ftsent->fts_pathlen,
ftsent->fts_path);
}
if (!qflag)
warnx("labeling not supported in %.*s",
ftsent->fts_pathlen,
(int) ftsent->fts_pathlen,
ftsent->fts_path);
fts_set(fts, ftsent, FTS_SKIP);
}
@ -170,11 +170,11 @@ main(int argc, char **argv)
case FTS_DNR: /* die on all errors */
case FTS_ERR:
case FTS_NS:
err(1, "traversing %.*s", ftsent->fts_pathlen,
err(1, "traversing %.*s", (int) ftsent->fts_pathlen,
ftsent->fts_path);
default:
errx(1, "CANNOT HAPPEN (%d) traversing %.*s",
ftsent->fts_info, ftsent->fts_pathlen,
ftsent->fts_info, (int) ftsent->fts_pathlen,
ftsent->fts_path);
}
}
@ -439,7 +439,7 @@ apply_specs(struct label_specs *specs, FTSENT *ftsent, int hflag, int vflag)
if (vflag) {
if (matchedby == 0) {
printf("%.*s matched by ",
ftsent->fts_pathlen,
(int) ftsent->fts_pathlen,
ftsent->fts_path);
matchedby = 1;
}
@ -483,7 +483,7 @@ apply_specs(struct label_specs *specs, FTSENT *ftsent, int hflag, int vflag)
free(macstr);
return (1);
}
err(1, "mac_set_link(%.*s, %s)", ftsent->fts_pathlen,
err(1, "mac_set_link(%.*s, %s)", (int) ftsent->fts_pathlen,
ftsent->fts_path, macstr);
}
mac_free(mac);