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>
This commit is contained in:
commit
75c4ce824f
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user