aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@amazon.com>2013-12-10 16:11:10 -0800
committerAnthony Liguori <aliguori@amazon.com>2013-12-10 16:11:10 -0800
commit75c4ce824ffd04a59f0af270f823fd5f1a59bd1a (patch)
tree6dbddcaf287bd232e1f6d3f28f0b0c2e99a752d4
parent45506cc2be6834196ac2773ec4267ca6780f17a1 (diff)
parent5ad04fb6f112cf2917909be4c22109dbb65fed18 (diff)
Merge remote-tracking branch 'alon/libcacard_ccid.4' into staging
# By Stefan Weil # Via Alon Levy * alon/libcacard_ccid.4: libcacard: Fix compilation for older versions of glib (bug #1258168) Message-id: 1386596263-26151-1-git-send-email-alevy@redhat.com Signed-off-by: Anthony Liguori <aliguori@amazon.com>
-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;