[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 51/64] slirp: replace some fprintf() with DEBUG_MISC
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULL 51/64] slirp: replace some fprintf() with DEBUG_MISC |
Date: |
Wed, 19 Dec 2018 00:04:29 +0100 |
From: Marc-André Lureau <address@hidden>
Remove some clutter, and avoids direct call to fprintf().
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
---
slirp/slirp.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 91210dc00a..84f6b05974 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -164,9 +164,7 @@ static int get_dns_addr_resolv_conf(int af, void
*pdns_addr, void *cached_addr,
if (!f)
return -1;
-#ifdef DEBUG
- fprintf(stderr, "IP address of your DNS(s): ");
-#endif
+ DEBUG_MISC("IP address of your DNS(s): ");
while (fgets(buff, 512, f) != NULL) {
if (sscanf(buff, "nameserver%*[ \t]%256s", buff2) == 1) {
char *c = strchr(buff2, '%');
@@ -188,15 +186,12 @@ static int get_dns_addr_resolv_conf(int af, void
*pdns_addr, void *cached_addr,
*scope_id = if_index;
}
*cached_time = curtime;
+ } else {
+ DEBUG_MISC(", ");
}
-#ifdef DEBUG
- else
- fprintf(stderr, ", ");
-#endif
+
if (++found > 3) {
-#ifdef DEBUG
- fprintf(stderr, "(more)");
-#endif
+ DEBUG_MISC("(more)");
break;
}
#ifdef DEBUG
@@ -206,7 +201,7 @@ static int get_dns_addr_resolv_conf(int af, void
*pdns_addr, void *cached_addr,
if (!res) {
res = "(string conversion error)";
}
- fprintf(stderr, "%s", res);
+ DEBUG_MISC("%s", res);
}
#endif
}
--
2.19.2
- [Qemu-devel] [PULL 45/64] slirp: replace error_report() with g_critical(), (continued)
- [Qemu-devel] [PULL 45/64] slirp: replace error_report() with g_critical(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 35/64] slirp: improve a bit the debug macros, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 15/64] slirp: use a callback structure to interface with qemu, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 44/64] slirp: simplify fork_exec(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 46/64] slirp: Enable fork_exec support on Windows, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 40/64] slirp: remove dead TCP_ACK_HACK code, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 39/64] slirp: NULL is defined by stddef.h, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 48/64] slirp: rename exec_list, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 37/64] slirp: remove #if notdef dead code, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 32/64] slirp: replace compile time DO_KEEPALIVE, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 51/64] slirp: replace some fprintf() with DEBUG_MISC,
Samuel Thibault <=
- [Qemu-devel] [PULL 54/64] slirp: always build with debug statements, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 49/64] slirp: use virtual time for packet expiration, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 59/64] slirp: factor out guestfwd addition checks, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 47/64] slirp: drop <Vista compatibility, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 53/64] slirp: no need to make DPRINTF conditional on DEBUG, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 58/64] slirp: replace DEBUG_ARGS with DEBUG_ARG, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 52/64] slirp: replace a DEBUG block with WITH_ICMP_ERROR_MSG, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 62/64] slirp: set G_LOG_DOMAIN, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 56/64] slirp: use %p for pointers format, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 57/64] slirp: remove remaining DEBUG blocks, Samuel Thibault, 2018/12/18