Changeset c66ec48

Timestamp:

Jun 21, 2011, 11:19:09 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Children:

f0d5ef5

Parents:

c5c5686

git-author:

David Benjamin <davidben@mit.edu> (05/30/11 22:22:22)

git-committer:

David Benjamin <davidben@mit.edu> (06/21/11 23:19:09)

Message:

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>

Files:

• popexec.c (modified) (1 diff)
• zephyr.c (modified) (2 diffs)

popexec.c

@@ -58 +58 @@
     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);

zephyr.c

@@ -93 +93 @@
 
   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);
@@ -1514 +1514 @@
   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);