Nuke some 'set but not used' pathlen variables.

ok beck@

diff --git a/usr.sbin/installboot/loongson_installboot.c b/usr.sbin/installboot/loongson_installboot.c
index c0dd6a5..4aeb26c 100644 (file)
--- a/usr.sbin/installboot/loongson_installboot.c
+++ b/usr.sbin/installboot/loongson_installboot.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: loongson_installboot.c,v 1.9 2022/10/19 19:08:25 kn Exp $     */
+/*     $OpenBSD: loongson_installboot.c,v 1.10 2022/11/06 20:03:48 krw Exp $   */
 /*     $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
 
 /*
@@ -105,7 +105,7 @@ write_filesystem(struct disklabel *dl, char part)
        struct ufs_args args;
        char cmd[60];
        char dst[PATH_MAX];
-       size_t mntlen, pathlen;
+       size_t mntlen;
        int rslt;
 
        /* Create directory for temporary mount point. */
@@ -179,7 +179,6 @@ write_filesystem(struct disklabel *dl, char part)
        /*
         * Copy /usr/mdec/boot to /boot/boot.
         */
-       pathlen = strlen(dst);
        if (strlcat(dst, "/boot", sizeof(dst)) >= sizeof(dst)) {
                rslt = -1;
                warn("unable to build /boot path");

diff --git a/usr.sbin/installboot/macppc_installboot.c b/usr.sbin/installboot/macppc_installboot.c
index 877ae12..bf31dbf 100644 (file)
--- a/usr.sbin/installboot/macppc_installboot.c
+++ b/usr.sbin/installboot/macppc_installboot.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: macppc_installboot.c,v 1.9 2022/11/06 12:33:41 krw Exp $      */
+/*     $OpenBSD: macppc_installboot.c,v 1.10 2022/11/06 20:03:49 krw Exp $     */
 
 /*
  * Copyright (c) 2011 Joel Sing <jsing@openbsd.org>
@@ -166,7 +166,7 @@ write_filesystem(struct disklabel *dl, char part)
        struct msdosfs_args args;
        char cmd[60];
        char dst[PATH_MAX];
-       size_t mntlen, pathlen;
+       size_t mntlen;
        int rslt;
 
        /* Create directory for temporary mount point. */
@@ -220,7 +220,6 @@ write_filesystem(struct disklabel *dl, char part)
        /*
         * Copy /usr/mdec/ofwboot to $FS/ofwboot.
         */
-       pathlen = strlen(dst);
        if (strlcat(dst, "/ofwboot", sizeof(dst)) >= sizeof(dst)) {
                rslt = -1;
                warn("unable to build /ofwboot path");

diff --git a/usr.sbin/installboot/octeon_installboot.c b/usr.sbin/installboot/octeon_installboot.c
index 2b1fa4e..184129c 100644 (file)
--- a/usr.sbin/installboot/octeon_installboot.c
+++ b/usr.sbin/installboot/octeon_installboot.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: octeon_installboot.c,v 1.9 2022/11/06 12:33:41 krw Exp $      */
+/*     $OpenBSD: octeon_installboot.c,v 1.10 2022/11/06 20:03:49 krw Exp $     */
 
 /*
  * Copyright (c) 2011 Joel Sing <jsing@openbsd.org>
@@ -166,7 +166,7 @@ write_filesystem(struct disklabel *dl, char part)
        struct msdosfs_args args;
        char cmd[60];
        char dst[PATH_MAX];
-       size_t mntlen, pathlen;
+       size_t mntlen;
        int rslt;
 
        /* Create directory for temporary mount point. */
@@ -220,7 +220,6 @@ write_filesystem(struct disklabel *dl, char part)
        /*
         * Copy /usr/mdec/boot to /mnt/boot.
         */
-       pathlen = strlen(dst);
        if (strlcat(dst, "/boot", sizeof(dst)) >= sizeof(dst)) {
                rslt = -1;
                warn("unable to build /boot path");