Changes in popexec.c [0e5afa2:18fdd5f9]
Legend:
- Unmodified
- Added
- Removed
-
popexec.c
r0e5afa2 r18fdd5f9 53 53 pe->pid=pid; 54 54 pe->winactive=1; 55 pe->dispatch.fd = parent_read_fd; 56 pe->dispatch.cfunc = owl_popexec_inputhandler; 57 pe->dispatch.destroy = owl_popexec_free_dispatch; 58 pe->dispatch.data = pe; 59 owl_select_add_dispatch(&pe->dispatch); 55 pe->dispatch = owl_select_add_io_dispatch(parent_read_fd, OWL_IO_READ|OWL_IO_EXCEPT, &owl_popexec_inputhandler, &owl_popexec_delete_dispatch, pe); 60 56 pe->refcount++; 61 57 } else { … … 78 74 } 79 75 80 void owl_popexec_inputhandler( owl_dispatch *d)76 void owl_popexec_inputhandler(const owl_io_dispatch *d, void *data) 81 77 { 82 owl_popexec *pe = d ->data;78 owl_popexec *pe = data; 83 79 int navail, bread, rv_navail; 84 80 char *buf; … … 99 95 /* the viewwin has closed */ 100 96 if (!pe->pid && !pe->winactive) { 101 owl_select_remove_ dispatch(d->fd);97 owl_select_remove_io_dispatch(d); 102 98 return; 103 99 } … … 116 112 owl_viewwin_redisplay(pe->vwin, 1); 117 113 } 118 owl_select_remove_ dispatch(d->fd);114 owl_select_remove_io_dispatch(d); 119 115 return; 120 116 } … … 146 142 } 147 143 148 void owl_popexec_ free_dispatch(owl_dispatch *d)144 void owl_popexec_delete_dispatch(const owl_io_dispatch *d) 149 145 { 150 146 owl_popexec *pe = d->data; … … 159 155 160 156 pe->winactive = 0; 161 if (pe->dispatch .fd>0) {162 owl_select_remove_ dispatch(pe->dispatch.fd);157 if (pe->dispatch->fd > 0) { 158 owl_select_remove_io_dispatch(pe->dispatch); 163 159 } 164 160 if (pe->pid) {
Note: See TracChangeset
for help on using the changeset viewer.
