git: c9048120185b - main - geom_eli: mostly plug set-but-not-unused vars

The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=c9048120185bd112a67f844afe3e1a3a0a066b73

commit c9048120185bd112a67f844afe3e1a3a0a066b73
Author:     Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2021-12-09 18:05:06 +0000
Commit:     Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2021-12-09 18:05:06 +0000

    geom_eli: mostly plug set-but-not-unused vars
    
    The remaining case is an ignored error.
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 sys/geom/eli/g_eli.c           | 4 ++--
 sys/geom/eli/g_eli_integrity.c | 2 +-
 sys/geom/eli/g_eli_privacy.c   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c
index 095d5cd2c274..4978523cbebe 100644
--- a/sys/geom/eli/g_eli.c
+++ b/sys/geom/eli/g_eli.c
@@ -657,7 +657,7 @@ g_eli_worker(void *arg)
 	struct g_eli_softc *sc;
 	struct g_eli_worker *wr;
 	struct bio *bp;
-	int error;
+	int error __diagused;
 
 	wr = arg;
 	sc = wr->w_softc;
@@ -824,7 +824,7 @@ g_eli_last_close(void *arg, int flags __unused)
 {
 	struct g_geom *gp;
 	char gpname[64];
-	int error;
+	int error __diagused;
 
 	g_topology_assert();
 	gp = arg;
diff --git a/sys/geom/eli/g_eli_integrity.c b/sys/geom/eli/g_eli_integrity.c
index 17a0912797c1..73b4a047a977 100644
--- a/sys/geom/eli/g_eli_integrity.c
+++ b/sys/geom/eli/g_eli_integrity.c
@@ -456,7 +456,7 @@ g_eli_auth_run(struct g_eli_worker *wr, struct bio *bp)
 	u_int i, lsec, nsec, data_secsize, decr_secsize, encr_secsize;
 	off_t dstoff;
 	u_char *p, *data, *authkey, *plaindata;
-	int error;
+	int error __diagused;
 	bool batch;
 
 	G_ELI_LOGREQ(3, bp, "%s", __func__);
diff --git a/sys/geom/eli/g_eli_privacy.c b/sys/geom/eli/g_eli_privacy.c
index 20a9f09452c5..b7f399c8afb9 100644
--- a/sys/geom/eli/g_eli_privacy.c
+++ b/sys/geom/eli/g_eli_privacy.c
@@ -263,7 +263,7 @@ g_eli_crypto_run(struct g_eli_worker *wr, struct bio *bp)
 	u_int i, nsec, secsize;
 	off_t dstoff;
 	u_char *data = NULL;
-	int error, pages_offset;
+	int error __diagused, pages_offset;
 	bool batch;
 
 	G_ELI_LOGREQ(3, bp, "%s", __func__);