korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-17 01:04:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fake input: fixed build error when glib is disabled

Browse Source
This commit is contained in:
Claudio Takahasi 2007-02-27 13:07:02 +00:00
parent af47f85ea4
commit bebbd2498d
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
input/device.c
View File

@ -531,7 +531,6 @@ static gboolean rfcomm_io_cb(GIOChannel *chan, GIOCondition cond, gpointer data)
{
struct fake_input *fake = data;
const char *ok = "\r\nOK\r\n";
GError *gerr = NULL;
char buf[BUF_SIZE];
gsize bread = 0, bwritten;
uint16_t key;
@ -545,19 +544,16 @@ static gboolean rfcomm_io_cb(GIOChannel *chan, GIOCondition cond, gpointer data)
}
memset(buf, 0, BUF_SIZE);
if (g_io_channel_read_chars(chan, (gchar *)buf, sizeof(buf) - 1,
&bread, &gerr) != G_IO_STATUS_NORMAL) {
error("IO Channel read error: %s", gerr->message);
g_error_free(gerr);
if (g_io_channel_read(chan, buf, sizeof(buf) - 1,
&bread) != G_IO_ERROR_NONE) {
error("IO Channel read error");
goto failed;
}
debug("Received: %s", buf);
if (g_io_channel_write_chars(chan, ok, 6, &bwritten,
&gerr) != G_IO_STATUS_NORMAL) {
error("IO Channel write error: %s", gerr->message);
g_error_free(gerr);
if (g_io_channel_write(chan, ok, 6, &bwritten) != G_IO_ERROR_NONE) {
error("IO Channel write error");
goto failed;
}
@ -568,7 +564,7 @@ static gboolean rfcomm_io_cb(GIOChannel *chan, GIOCondition cond, gpointer data)
return TRUE;
failed:
g_io_channel_shutdown(fake->io, FALSE, NULL);
g_io_channel_close(chan);
g_io_channel_unref(chan);
ioctl(fake->uinput, UI_DEV_DESTROY);
close(fake->uinput);
@ -925,7 +921,7 @@ static int disconnect(struct input_device *idev, uint32_t flags)
/* Fake input disconnect */
if (fake) {
if (fake->io) {
g_io_channel_shutdown(fake->io, FALSE, NULL);
g_io_channel_close(fake->io);
g_io_channel_unref(fake->io);
fake->io = NULL;
}