===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshbuf.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- src/usr.bin/ssh/sshbuf.c	2022/05/25 00:31:13	1.17
+++ src/usr.bin/ssh/sshbuf.c	2022/05/25 06:03:44	1.18
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sshbuf.c,v 1.17 2022/05/25 00:31:13 djm Exp $	*/
+/*	$OpenBSD: sshbuf.c,v 1.18 2022/05/25 06:03:44 djm Exp $	*/
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -39,7 +39,7 @@
 	    buf->size > buf->alloc ||
 	    buf->off > buf->size)) {
 		/* Do not try to recover from corrupted buffer internals */
-		SSHBUF_DBG("SSH_ERR_INTERNAL_ERROR");
+		SSHBUF_DBG(("SSH_ERR_INTERNAL_ERROR"));
 		ssh_signal(SIGSEGV, SIG_DFL);
 		raise(SIGSEGV);
 		return SSH_ERR_INTERNAL_ERROR;
@@ -50,7 +50,7 @@
 static void
 sshbuf_maybe_pack(struct sshbuf *buf, int force)
 {
-	SSHBUF_DBG("force %d", force);
+	SSHBUF_DBG(("force %d", force));
 	SSHBUF_TELL("pre-pack");
 	if (buf->off == 0 || buf->readonly || buf->refcount > 1)
 		return;
@@ -221,7 +221,7 @@
 	u_char *dp;
 	int r;
 
-	SSHBUF_DBG("set max buf = %p len = %zu", buf, max_size);
+	SSHBUF_DBG(("set max buf = %p len = %zu", buf, max_size));
 	if ((r = sshbuf_check_sanity(buf)) != 0)
 		return r;
 	if (max_size == buf->max_size)
@@ -239,7 +239,7 @@
 			rlen = ROUNDUP(buf->size, SSHBUF_SIZE_INC);
 		if (rlen > max_size)
 			rlen = max_size;
-		SSHBUF_DBG("new alloc = %zu", rlen);
+		SSHBUF_DBG(("new alloc = %zu", rlen));
 		if ((dp = recallocarray(buf->d, buf->alloc, rlen, 1)) == NULL)
 			return SSH_ERR_ALLOC_FAIL;
 		buf->cd = buf->d = dp;
@@ -307,7 +307,7 @@
 	u_char *dp;
 	int r;
 
-	SSHBUF_DBG("allocate buf = %p len = %zu", buf, len);
+	SSHBUF_DBG(("allocate buf = %p len = %zu", buf, len));
 	if ((r = sshbuf_check_reserve(buf, len)) != 0)
 		return r;
 	/*
@@ -325,12 +325,12 @@
 	 */
 	need = len + buf->size - buf->alloc;
 	rlen = ROUNDUP(buf->alloc + need, SSHBUF_SIZE_INC);
-	SSHBUF_DBG("need %zu initial rlen %zu", need, rlen);
+	SSHBUF_DBG(("need %zu initial rlen %zu", need, rlen));
 	if (rlen > buf->max_size)
 		rlen = buf->alloc + need;
-	SSHBUF_DBG("adjusted rlen %zu", rlen);
+	SSHBUF_DBG(("adjusted rlen %zu", rlen));
 	if ((dp = recallocarray(buf->d, buf->alloc, rlen, 1)) == NULL) {
-		SSHBUF_DBG("realloc fail");
+		SSHBUF_DBG(("realloc fail"));
 		return SSH_ERR_ALLOC_FAIL;
 	}
 	buf->alloc = rlen;
@@ -352,7 +352,7 @@
 	if (dpp != NULL)
 		*dpp = NULL;
 
-	SSHBUF_DBG("reserve buf = %p len = %zu", buf, len);
+	SSHBUF_DBG(("reserve buf = %p len = %zu", buf, len));
 	if ((r = sshbuf_allocate(buf, len)) != 0)
 		return r;
 
@@ -368,7 +368,7 @@
 {
 	int r;
 
-	SSHBUF_DBG("len = %zu", len);
+	SSHBUF_DBG(("len = %zu", len));
 	if ((r = sshbuf_check_sanity(buf)) != 0)
 		return r;
 	if (len == 0)
@@ -388,7 +388,7 @@
 {
 	int r;
 
-	SSHBUF_DBG("len = %zu", len);
+	SSHBUF_DBG(("len = %zu", len));
 	if ((r = sshbuf_check_sanity(buf)) != 0)
 		return r;
 	if (len == 0)