From nobody Mon Apr 4 21:25:01 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id ECBE41A9D933; Mon, 4 Apr 2022 21:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KXP1n5WT9z4m4r; Mon, 4 Apr 2022 21:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649107501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FQRG1G92sgmu11c6zpweDQMak61RaPwOAUS5ZtpYdEc=; b=L8A0q8T+/YSUcKbEbBDYPMHbhwSJbZonkonufPqIByy40dWZyE0I5tMsClf2+Ocx7jw8a/ tW/tRUmN27T9C0AMt6DFieGZnK9C4Ulln+7s3NTUuHjNJHav9U1ZXvW3NJx7brWFXGKb0w STYjUGTx3YV4VSF1HgWL7ziu/p02oI1I2JptE1qBpFb/tRqv/MsWkY4vjHY6Wc8zLPp3Hl 60WVviuy0BNokdQZwOo4CmSvitfBKZN9Xx/qQUbbYctvIbFPNjt3PCDISWpyO6AOCeNZAI LrAbpoUeQArG/rBvkUP0O+TTBgm8UKkX47UsGI6A1NZpuuHGh4rG/7MFqqnFhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9DA9A19564; Mon, 4 Apr 2022 21:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 234LP1PG029441; Mon, 4 Apr 2022 21:25:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234LP1Ed029440; Mon, 4 Apr 2022 21:25:01 GMT (envelope-from git) Date: Mon, 4 Apr 2022 21:25:01 GMT Message-Id: <202204042125.234LP1Ed029440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: f3f6e0ebe9ec - main - geom_vinum: fix set but not used warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3f6e0ebe9ec2d7904858e16955ddc16a4389f3f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649107501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FQRG1G92sgmu11c6zpweDQMak61RaPwOAUS5ZtpYdEc=; b=AYCg0IbCqiBzmp14M8yG7YYBhLmzKudUxnAgnf4/l/9mCxPdLK8Pl00iYE1bbSmaAN+woK AsUSVmSN8tTi/7U+tHl071esKyGFt1w3nYAkGTBiMhyLmGVc7iWOSpJ7KD2mHjOOskVN63 k2fo0gdPwlK4SvFptQUWZuBovFXn92YfXGVal+u6SOlk9ceObWPP0Jz7lNryL97NtPF15v z21bt9FXP0kCFl20yo/8jrj/l6ncJX4wTIooi55TYohHUZEjU9NgaKPrL7U2yU7YDZD72O oHv2jT3V88IYPLLsT5OHFC5P1M8uFqpTGS/RPU2HQQTiAJMBzqlM6RHKXSvrXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649107501; a=rsa-sha256; cv=none; b=yJ0T7bOM6PSrk77tNQgP8D0y2uQ4lIoExh1byxNt61jvNoRf132mm7wv2EctBKA9NCJf3p Od6EQ/AiWfjIoydyw+19B57cIKNJeirr1H61nyQ+TSLnYytJHMqdEkSWBhHz2K2kVkHa2k jYsCxqhIcjuvk7aJ4VUWkHPDFKyfm1G3mtFzssCWBGfktjqLT5JzlnSPp38Wo/tpd1lGzD 7KINnf4qJjTzE83riJDHqqWvECzYBIKA8VYhXThJvtcv0Gi4kephkxB4V0nGzxDhcfWbK/ nh7ZUzYQMx+fX5+DFMmRzeKnTTJyz8y9r463Bx9z/TB0Q7bx9eIZA9fCq9YBbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=f3f6e0ebe9ec2d7904858e16955ddc16a4389f3f commit f3f6e0ebe9ec2d7904858e16955ddc16a4389f3f Author: Robert Wing AuthorDate: 2022-04-04 21:23:47 +0000 Commit: Robert Wing CommitDate: 2022-04-04 21:23:47 +0000 geom_vinum: fix set but not used warnings --- sys/geom/vinum/geom_vinum.c | 5 +---- sys/geom/vinum/geom_vinum_subr.c | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/geom/vinum/geom_vinum.c b/sys/geom/vinum/geom_vinum.c index 86f5c9f08e1f..b0a278104194 100644 --- a/sys/geom/vinum/geom_vinum.c +++ b/sys/geom/vinum/geom_vinum.c @@ -313,7 +313,7 @@ gv_create(struct g_geom *gp, struct gctl_req *req) struct gv_sd *s, *s2; struct gv_volume *v, *v2; struct g_provider *pp; - int error, i, *drives, *flags, *plexes, *subdisks, *volumes; + int i, *drives, *flags, *plexes, *subdisks, *volumes; char buf[20]; g_topology_assert(); @@ -374,7 +374,6 @@ gv_create(struct g_geom *gp, struct gctl_req *req) /* ... then volume definitions ... */ for (i = 0; i < *volumes; i++) { - error = 0; snprintf(buf, sizeof(buf), "volume%d", i); v2 = gctl_get_paraml(req, buf, sizeof(*v2)); if (v2 == NULL) { @@ -397,7 +396,6 @@ gv_create(struct g_geom *gp, struct gctl_req *req) /* ... then plex definitions ... */ for (i = 0; i < *plexes; i++) { - error = 0; snprintf(buf, sizeof(buf), "plex%d", i); p2 = gctl_get_paraml(req, buf, sizeof(*p2)); if (p2 == NULL) { @@ -420,7 +418,6 @@ gv_create(struct g_geom *gp, struct gctl_req *req) /* ... and, finally, subdisk definitions. */ for (i = 0; i < *subdisks; i++) { - error = 0; snprintf(buf, sizeof(buf), "sd%d", i); s2 = gctl_get_paraml(req, buf, sizeof(*s2)); if (s2 == NULL) { diff --git a/sys/geom/vinum/geom_vinum_subr.c b/sys/geom/vinum/geom_vinum_subr.c index 54dd6db95e5e..b68541bf00a7 100644 --- a/sys/geom/vinum/geom_vinum_subr.c +++ b/sys/geom/vinum/geom_vinum_subr.c @@ -1168,7 +1168,7 @@ int gv_attach_sd(struct gv_sd *s, struct gv_plex *p, off_t offset, int rename) { struct gv_sd *s2; - int error, sdcount; + int error; g_topology_assert(); @@ -1193,7 +1193,6 @@ gv_attach_sd(struct gv_sd *s, struct gv_plex *p, off_t offset, int rename) s->plex_offset = offset; strlcpy(s->plex, p->name, sizeof(s->plex)); - sdcount = p->sdcount; error = gv_sd_to_plex(s, p); if (error) return (error);