Permalink
Browse files

Remove all uses of G_IO_PRI

Any use of G_IO_PRI (and correspondingly OWL_IO_EXCEPT) is likely a bug
as it's not really used for anything useful. The main use case is TCP
out-of-band data which really isn't used by anyone.

Reported-by: Anders Kaseorg <andersk@mit.edu>
  • Loading branch information...
davidben committed May 31, 2011
1 parent aa69c1e commit e146cd7daa6e098d58e1d6cbbf8c74225bcd2da8
Showing with 3 additions and 3 deletions.
  1. +1 −1 popexec.c
  2. +2 −2 zephyr.c
View
@@ -57,7 +57,7 @@ owl_popexec *owl_popexec_new(const char *command)
channel = g_io_channel_unix_new(parent_read_fd);
g_io_channel_set_close_on_unref(channel, TRUE);
pe->io_watch = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT,
- G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP,
+ G_IO_IN | G_IO_ERR | G_IO_HUP,
owl_popexec_inputhandler, pe,
(GDestroyNotify)owl_popexec_unref);
g_io_channel_unref(channel);
View
@@ -92,7 +92,7 @@ void owl_zephyr_initialize(void)
}
channel = g_io_channel_unix_new(ZGetFD());
- g_io_add_watch(channel, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP,
+ g_io_add_watch(channel, G_IO_IN | G_IO_ERR | G_IO_HUP,
&owl_zephyr_finish_initialization, NULL);
g_io_channel_unref(channel);
}
@@ -1513,7 +1513,7 @@ static GSource *owl_zephyr_event_source_new(int fd) {
source = g_source_new(&zephyr_event_funcs, sizeof(owl_zephyr_event_source));
event_source = (owl_zephyr_event_source*) source;
event_source->poll_fd.fd = fd;
- event_source->poll_fd.events = G_IO_IN | G_IO_HUP | G_IO_PRI | G_IO_ERR;
+ event_source->poll_fd.events = G_IO_IN | G_IO_HUP | G_IO_ERR;
g_source_add_poll(source, &event_source->poll_fd);
return source;

0 comments on commit e146cd7

Please sign in to comment.