aboutsummaryrefslogtreecommitdiff
path: root/libcacard
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2013-12-05 19:41:28 +0100
committerAlon Levy <alevy@redhat.com>2013-12-09 12:19:05 +0200
commit5ad04fb6f112cf2917909be4c22109dbb65fed18 (patch)
treefa520e6ed1a9431d5524fcfb949926d807435005 /libcacard
parenta1d22a367d5780c9553b2cd5a24f665534ce6ed6 (diff)
downloadqemu-arm-5ad04fb6f112cf2917909be4c22109dbb65fed18.tar.gz
libcacard: Fix compilation for older versions of glib (bug #1258168)
See https://bugs.launchpad.net/bugs/1258168 libcacard/vscclient.c: In function 'do_socket_read': libcacard/vscclient.c:410: warning: implicit declaration of function 'g_warn_if_reached' libcacard/vscclient.c:410: warning: nested extern declaration of 'g_warn_if_reached' libcacard/vscclient.c: In function 'main': libcacard/vscclient.c:763: warning: implicit declaration of function 'g_byte_array_unref' libcacard/vscclient.c:763: warning: nested extern declaration of 'g_byte_array_unref' ... libcacard/vscclient.o: In function `do_socket_read': libcacard/vscclient.c:410: undefined reference to `g_warn_if_reached' libcacard/vscclient.o: In function `main': libcacard/vscclient.c:763: undefined reference to `g_byte_array_unref' g_warn_if_reached was added in glib 2.16, and g_byte_array_unref is supported since glib 2.22. QEMU requires glib 2.12, so both names must not be used. Instead of showing a warning for code which should not be reached, vscclient better stop running, so g_warn_if_reached is not useful for vscclient. In libcacard/vsclient.c, g_byte_array_unref can be replaced by g_byte_array_free. This is not generally true, so adding a compatibility layer in include/glib-compat.h is no option here. Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com> Reported-by: Don Slutz <dslutz@verizon.com> Signed-off-by: Stefan Weil <sw@weilnetz.de>
Diffstat (limited to 'libcacard')
-rw-r--r--libcacard/vscclient.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c
index a3cb7762b5..f1d46d397a 100644
--- a/libcacard/vscclient.c
+++ b/libcacard/vscclient.c
@@ -407,7 +407,7 @@ do_socket_read(GIOChannel *source,
}
break;
default:
- g_warn_if_reached();
+ g_assert_not_reached();
return FALSE;
}
@@ -760,7 +760,7 @@ main(
g_io_channel_unref(channel_stdin);
g_io_channel_unref(channel_socket);
- g_byte_array_unref(socket_to_send);
+ g_byte_array_free(socket_to_send, TRUE);
closesocket(sock);
return 0;