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

Add missing flags to g_io_add_watch calls

Browse Source
This commit is contained in:
Johan Hedberg 2007-02-16 20:18:37 +00:00
parent bc6af96cbd
commit 559a9a2ef3
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/notify-inotify.c
View File

@ -102,7 +102,7 @@ void notify_init(void)
return;
}
g_io_add_watch(io, G_IO_IN, io_event, NULL);
g_io_add_watch(io, G_IO_IN | G_IO_ERR | G_IO_HUP, io_event, NULL);
}
void notify_close(void)

9
sdpd/server.c
View File

@ -207,7 +207,8 @@ static gboolean io_accept_event(GIOChannel *chan, GIOCondition cond, gpointer da
io = g_io_channel_unix_new(nsk);
g_io_channel_set_close_on_unref(io, TRUE);
g_io_add_watch(io, G_IO_IN, io_session_event, data);
g_io_add_watch(io, G_IO_IN | G_IO_ERR | G_IO_HUP, io_session_event,
data);
g_io_channel_unref(io);
@ -230,13 +231,15 @@ int start_sdp_server(uint16_t mtu, uint32_t flags)
l2cap_io = g_io_channel_unix_new(l2cap_sock);
g_io_channel_set_close_on_unref(l2cap_io, TRUE);
g_io_add_watch(l2cap_io, G_IO_IN, io_accept_event, &l2cap_sock);
g_io_add_watch(l2cap_io, G_IO_IN | G_IO_ERR | G_IO_HUP,
io_accept_event, &l2cap_sock);
if (compat && unix_sock > fileno(stderr)) {
unix_io = g_io_channel_unix_new(unix_sock);
g_io_channel_set_close_on_unref(unix_io, TRUE);
g_io_add_watch(unix_io, G_IO_IN, io_accept_event, &unix_sock);
g_io_add_watch(unix_io, G_IO_IN | G_IO_ERR | G_IO_HUP,
io_accept_event, &unix_sock);
}
return 0;

3
transfer/process.c
View File

@ -74,7 +74,8 @@ int create_reader(uid_t uid, const char *pathname,
io = g_io_channel_unix_new(pfd[0]);
g_io_channel_set_close_on_unref(io, TRUE);
g_io_add_watch(io, G_IO_IN, func, user_data);
g_io_add_watch(io, G_IO_IN | G_IO_ERR | G_IO_HUP, func,
user_data);
g_io_channel_unref(io);