===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshbuf-getput-basic.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- src/usr.bin/ssh/sshbuf-getput-basic.c	2022/05/25 00:31:13	1.12
+++ src/usr.bin/ssh/sshbuf-getput-basic.c	2022/05/25 06:03:44	1.13
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sshbuf-getput-basic.c,v 1.12 2022/05/25 00:31:13 djm Exp $	*/
+/*	$OpenBSD: sshbuf-getput-basic.c,v 1.13 2022/05/25 06:03:44 djm Exp $	*/
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -194,7 +194,7 @@
 		return r;
 	if (valp != NULL) {
 		if ((*valp = malloc(len + 1)) == NULL) {
-			SSHBUF_DBG("SSH_ERR_ALLOC_FAIL");
+			SSHBUF_DBG(("SSH_ERR_ALLOC_FAIL"));
 			return SSH_ERR_ALLOC_FAIL;
 		}
 		if (len != 0)
@@ -225,7 +225,7 @@
 		*lenp = len;
 	if (sshbuf_consume(buf, len + 4) != 0) {
 		/* Shouldn't happen */
-		SSHBUF_DBG("SSH_ERR_INTERNAL_ERROR");
+		SSHBUF_DBG(("SSH_ERR_INTERNAL_ERROR"));
 		SSHBUF_ABORT();
 		return SSH_ERR_INTERNAL_ERROR;
 	}
@@ -244,16 +244,16 @@
 	if (lenp != NULL)
 		*lenp = 0;
 	if (sshbuf_len(buf) < 4) {
-		SSHBUF_DBG("SSH_ERR_MESSAGE_INCOMPLETE");
+		SSHBUF_DBG(("SSH_ERR_MESSAGE_INCOMPLETE"));
 		return SSH_ERR_MESSAGE_INCOMPLETE;
 	}
 	len = PEEK_U32(p);
 	if (len > SSHBUF_SIZE_MAX - 4) {
-		SSHBUF_DBG("SSH_ERR_STRING_TOO_LARGE");
+		SSHBUF_DBG(("SSH_ERR_STRING_TOO_LARGE"));
 		return SSH_ERR_STRING_TOO_LARGE;
 	}
 	if (sshbuf_len(buf) - 4 < len) {
-		SSHBUF_DBG("SSH_ERR_MESSAGE_INCOMPLETE");
+		SSHBUF_DBG(("SSH_ERR_MESSAGE_INCOMPLETE"));
 		return SSH_ERR_MESSAGE_INCOMPLETE;
 	}
 	if (valp != NULL)
@@ -279,14 +279,14 @@
 	/* Allow a \0 only at the end of the string */
 	if (len > 0 &&
 	    (z = memchr(p , '\0', len)) != NULL && z < p + len - 1) {
-		SSHBUF_DBG("SSH_ERR_INVALID_FORMAT");
+		SSHBUF_DBG(("SSH_ERR_INVALID_FORMAT"));
 		return SSH_ERR_INVALID_FORMAT;
 	}
 	if ((r = sshbuf_skip_string(buf)) != 0)
 		return -1;
 	if (valp != NULL) {
 		if ((*valp = malloc(len + 1)) == NULL) {
-			SSHBUF_DBG("SSH_ERR_ALLOC_FAIL");
+			SSHBUF_DBG(("SSH_ERR_ALLOC_FAIL"));
 			return SSH_ERR_ALLOC_FAIL;
 		}
 		if (len != 0)
@@ -513,7 +513,7 @@
 	int r;
 
 	if (len > SSHBUF_SIZE_MAX - 4) {
-		SSHBUF_DBG("SSH_ERR_NO_BUFFER_SPACE");
+		SSHBUF_DBG(("SSH_ERR_NO_BUFFER_SPACE"));
 		return SSH_ERR_NO_BUFFER_SPACE;
 	}
 	if ((r = sshbuf_reserve(buf, len + 4, &d)) < 0)
@@ -571,7 +571,7 @@
 	int r, prepend;
 
 	if (len > SSHBUF_SIZE_MAX - 5) {
-		SSHBUF_DBG("SSH_ERR_NO_BUFFER_SPACE");
+		SSHBUF_DBG(("SSH_ERR_NO_BUFFER_SPACE"));
 		return SSH_ERR_NO_BUFFER_SPACE;
 	}
 	/* Skip leading zero bytes */
@@ -621,7 +621,7 @@
 		*lenp = len;
 	if (sshbuf_consume(buf, olen + 4) != 0) {
 		/* Shouldn't happen */
-		SSHBUF_DBG("SSH_ERR_INTERNAL_ERROR");
+		SSHBUF_DBG(("SSH_ERR_INTERNAL_ERROR"));
 		SSHBUF_ABORT();
 		return SSH_ERR_INTERNAL_ERROR;
 	}