From 2afbb788ff43c5cb5a91fb3da9cae6bd9a70731f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 14 Nov 2018 16:36:31 +0400 Subject: slirp: improve a bit the debug macros MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let them accept multiple arguments. Simplify the inner argument handling of DEBUG_ARGS/DEBUG_MISC_DEBUG_ERROR. Signed-off-by: Marc-André Lureau Signed-off-by: Samuel Thibault --- slirp/dhcpv6.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'slirp/dhcpv6.c') diff --git a/slirp/dhcpv6.c b/slirp/dhcpv6.c index d266611..943a13b 100644 --- a/slirp/dhcpv6.c +++ b/slirp/dhcpv6.c @@ -92,14 +92,14 @@ static int dhcpv6_parse_info_request(uint8_t *odata, int olen, ri->want_boot_url = true; break; default: - DEBUG_MISC((dfd, "dhcpv6: Unsupported option request %d\n", - req_opt)); + DEBUG_MISC("dhcpv6: Unsupported option request %d\n", + req_opt); } } break; default: - DEBUG_MISC((dfd, "dhcpv6 info req: Unsupported option %d, len=%d\n", - option, len)); + DEBUG_MISC("dhcpv6 info req: Unsupported option %d, len=%d\n", + option, len); } odata += len + 4; @@ -203,7 +203,6 @@ void dhcpv6_input(struct sockaddr_in6 *srcsas, struct mbuf *m) dhcpv6_info_request(m->slirp, srcsas, xid, &data[4], data_len - 4); break; default: - DEBUG_MISC((dfd, "dhcpv6_input: Unsupported message type 0x%x\n", - data[0])); + DEBUG_MISC("dhcpv6_input: Unsupported message type 0x%x\n", data[0]); } } -- cgit v1.1