diff options
| author |   guenther <guenther@openbsd.org> | 2017-08-12 03:13:23 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2017-08-12 03:13:23 +0000 |
| commit | 7e0b1b7c68ff14300dd6d6087e5a7b331ad331fb (patch) | |
| tree | 9123810ba3f5368b632b344c5cfc5e1a5cdc9420 | |
| parent | Update the TLSv1.2 Client Hello messages, due to the removal of DSA (diff) | |
| download | wireguard-openbsd-7e0b1b7c68ff14300dd6d6087e5a7b331ad331fb.tar.xz wireguard-openbsd-7e0b1b7c68ff14300dd6d6087e5a7b331ad331fb.zip | |
Silence clang warnings: remove unused variables and s/%hx/%x/g
ok mpi@ deraadt@
| -rw-r--r-- | sys/kern/subr_witness.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index eec059c8f2d..7387c50808a 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_witness.c,v 1.3 2017/05/22 13:54:14 visa Exp $ */ +/* $OpenBSD: subr_witness.c,v 1.4 2017/08/12 03:13:23 guenther Exp $ */ /*- * Copyright (c) 2008 Isilon Systems, Inc. @@ -30,8 +30,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from BSDI $Id: subr_witness.c,v 1.3 2017/05/22 13:54:14 visa Exp $ - * and BSDI $Id: subr_witness.c,v 1.3 2017/05/22 13:54:14 visa Exp $ + * from BSDI $Id: subr_witness.c,v 1.4 2017/08/12 03:13:23 guenther Exp $ + * and BSDI $Id: subr_witness.c,v 1.4 2017/08/12 03:13:23 guenther Exp $ */ /* @@ -416,8 +416,6 @@ static struct witness_lock_order_data *w_lofree = NULL; static struct witness_lock_order_hash w_lohash; static int w_max_used_index = 0; static unsigned int w_generation = 0; -static const char w_notrunning[] = "Witness not running\n"; -static const char w_stillcold[] = "Witness is still cold\n"; static struct lock_class lock_class_kernel_lock = { .lc_name = "kernel_lock", @@ -1649,8 +1647,8 @@ _isitmyx(struct witness *w1, struct witness *w2, int rmask, const char *fname) if (w_mtx.mtx_owner != curcpu()) return (0); printf("%s: rmatrix mismatch between %s (index %d) and %s " - "(index %d): w_rmatrix[%d][%d] == %hx but " - "w_rmatrix[%d][%d] == %hx\n", + "(index %d): w_rmatrix[%d][%d] == %x but " + "w_rmatrix[%d][%d] == %x\n", fname, w1->w_type->lt_name, i1, w2->w_type->lt_name, i2, i1, i2, r1, i2, i1, r2); |