summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcheloha <cheloha@openbsd.org>2019-02-26 21:42:45 +0000
committercheloha <cheloha@openbsd.org>2019-02-26 21:42:45 +0000
commit7f72be8c17b0916b78adf60f3360f47c3262a34c (patch)
tree7de40299b8bb66e66f0f3c1a3d5dabae71baced8
parentadd domain-search to the list of options capable of adding to resolv.conf; (diff)
downloadwireguard-openbsd-7f72be8c17b0916b78adf60f3360f47c3262a34c.tar.xz
wireguard-openbsd-7f72be8c17b0916b78adf60f3360f47c3262a34c.zip
use real format strings, resolve compiler warnings; ok millert@
-rw-r--r--gnu/usr.sbin/mkhybrid/src/desktop.c10
-rw-r--r--gnu/usr.sbin/mkhybrid/src/write.c4
2 files changed, 7 insertions, 7 deletions
diff --git a/gnu/usr.sbin/mkhybrid/src/desktop.c b/gnu/usr.sbin/mkhybrid/src/desktop.c
index 9807353e21f..62ca669255d 100644
--- a/gnu/usr.sbin/mkhybrid/src/desktop.c
+++ b/gnu/usr.sbin/mkhybrid/src/desktop.c
@@ -95,28 +95,28 @@ make_desktop(hfsvol *vol, int end)
/* open file */
if((hfp = hfs_open(vol, DB)) == 0)
- err(1, hfs_error);
+ err(1, "%s", hfs_error);
/* "write" file */
write_fork(hfp, clps);
/* set DB file attributes */
if (hfs_fsetattr(hfp, &ent) < 0)
- err(1, hfs_error);
+ err(1, "%s", hfs_error);
/* find the real start of the file */
end += hce->hfs_ce_size;
/* close DB file */
if (hfs_close(hfp, end, 0) < 0)
- err(1, hfs_error);
+ err(1, "%s", hfs_error);
}
else
{
/* if it already exists, then make sure it has the correct
type/creator and flags */
if(hfs_setattr(vol, DB, &ent) < 0)
- err(1, hfs_error);
+ err(1, "%s", hfs_error);
}
/* setup "Desktop DF" file as an empty file */
@@ -128,7 +128,7 @@ make_desktop(hfsvol *vol, int end)
/* set DB file attributes */
if (hfs_setattr(vol, DF, &ent) < 0)
- err(1, hfs_error);
+ err(1, "%s", hfs_error);
return 0;
}
#endif /* APPLE_HYB */
diff --git a/gnu/usr.sbin/mkhybrid/src/write.c b/gnu/usr.sbin/mkhybrid/src/write.c
index 681fe48e8ff..c8607699352 100644
--- a/gnu/usr.sbin/mkhybrid/src/write.c
+++ b/gnu/usr.sbin/mkhybrid/src/write.c
@@ -1545,7 +1545,7 @@ static int file_gen()
/* exit with the error */
if (*hce->error)
fprintf(stderr, "%s\n", hce->error);
- err(1, hfs_error);
+ err(1, "%s", hfs_error);
}
else
{
@@ -1575,7 +1575,7 @@ static int file_gen()
if (gen_mac_label(&mac_boot)) {
if (*hce->error)
fprintf(stderr, "%s\n", hce->error);
- err(1, hfs_error);
+ err(1, "%s", hfs_error);
}
}