]> git.proxmox.com Git - mirror_qemu.git/commitdiff
slirp: fix compilation errors with DEBUG set
authorLaurent Vivier <laurent@vivier.eu>
Mon, 27 Mar 2017 08:46:12 +0000 (10:46 +0200)
committerSamuel Thibault <samuel.thibault@ens-lyon.org>
Tue, 28 Mar 2017 22:49:04 +0000 (00:49 +0200)
slirp/slirp.c: In function 'get_dns_addr_resolv_conf':
slirp/slirp.c:202:29: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
                 char *res = inet_ntop(af, tmp_addr, s, sizeof(s));
                             ^~~~~~~~~
slirp/slirp.c:204:25: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
                     res = "(string conversion error)";

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
slirp/slirp.c

index 60539de7a3d5f2c2d11a60c75c6861e6cfe48132..5a94b06f5eb487a6290e8205486622532f88dd41 100644 (file)
@@ -198,7 +198,7 @@ static int get_dns_addr_resolv_conf(int af, void *pdns_addr, void *cached_addr,
 #ifdef DEBUG
             else {
                 char s[INET6_ADDRSTRLEN];
-                char *res = inet_ntop(af, tmp_addr, s, sizeof(s));
+                const char *res = inet_ntop(af, tmp_addr, s, sizeof(s));
                 if (!res) {
                     res = "(string conversion error)";
                 }