diff options
| author | Ray Strode <rstrode@redhat.com> | 2007-05-22 13:38:22 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2007-05-22 13:38:22 -0400 |
| commit | ba7021ecdcd2e5179ff5d24c7dff1bf494c49e3d (patch) | |
| tree | a1f6ac117ec82c52b992d08c190508e6fbda20d2 /src | |
| parent | ade173a02d7eff42d4022556f4e9967040287cd7 (diff) | |
| download | plymouth-ba7021ecdcd2e5179ff5d24c7dff1bf494c49e3d.tar.gz plymouth-ba7021ecdcd2e5179ff5d24c7dff1bf494c49e3d.tar.xz plymouth-ba7021ecdcd2e5179ff5d24c7dff1bf494c49e3d.zip | |
remove some more bogus bool return values
Diffstat (limited to 'src')
| -rw-r--r-- | src/ply-event-loop.c | 39 | ||||
| -rw-r--r-- | src/ply-event-loop.h | 4 |
2 files changed, 19 insertions, 24 deletions
diff --git a/src/ply-event-loop.c b/src/ply-event-loop.c index c93fad3..95d4b5e 100644 --- a/src/ply-event-loop.c +++ b/src/ply-event-loop.c @@ -388,21 +388,21 @@ ply_event_loop_free (ply_event_loop_t *loop) free (loop); } -static bool +static void ply_event_loop_add_source (ply_event_loop_t *loop, ply_event_source_t *source) { struct epoll_event event = { 0 }; + int status; event.events = EPOLLIN | EPOLLPRI | EPOLLERR | EPOLLHUP; event.data.ptr = source; - if (epoll_ctl (loop->epoll_fd, EPOLL_CTL_ADD, source->fd, &event) < 0) - return false; + status = epoll_ctl (loop->epoll_fd, EPOLL_CTL_ADD, source->fd, &event); + + assert (status == 0); ply_list_append_data (loop->sources, source); - - return true; } static void @@ -462,12 +462,12 @@ ply_event_loop_find_source_node (ply_event_loop_t *loop, return node; } -bool -ply_event_loop_watch_fd (ply_event_loop_t *loop, - int fd, - ply_event_handler_t new_data_handler, - ply_event_handler_t disconnected_handler, - void *user_data) +void +ply_event_loop_watch_fd (ply_event_loop_t *loop, + int fd, + ply_event_handler_t new_data_handler, + ply_event_handler_t disconnected_handler, + void *user_data) { ply_list_node_t *node; ply_event_source_t *source; @@ -477,14 +477,11 @@ ply_event_loop_watch_fd (ply_event_loop_t *loop, assert (node == NULL); source = ply_event_source_new (fd, - new_data_handler, - disconnected_handler, - user_data, NULL); - - if (!ply_event_loop_add_source (loop, source)) - return false; + new_data_handler, + disconnected_handler, + user_data, NULL); - return true; + ply_event_loop_add_source (loop, source); } void @@ -527,7 +524,7 @@ ply_signal_dispatcher_find_source_node (ply_signal_dispatcher_t *dispatcher, return node; } -bool +void ply_event_loop_watch_signal (ply_event_loop_t *loop, int signal_number, ply_event_handler_t signal_handler, @@ -542,13 +539,11 @@ ply_event_loop_watch_signal (ply_event_loop_t *loop, source->old_posix_signal_handler = signal (signal_number, ply_signal_dispatcher_posix_signal_handler); ply_list_append_data (loop->signal_dispatcher->sources, source); - - return true; } static void ply_signal_dispatcher_remove_source_node (ply_signal_dispatcher_t *dispatcher, - ply_list_node_t *node) + ply_list_node_t *node) { ply_signal_source_t *source; diff --git a/src/ply-event-loop.h b/src/ply-event-loop.h index 6f90bc4..b09dc46 100644 --- a/src/ply-event-loop.h +++ b/src/ply-event-loop.h @@ -36,14 +36,14 @@ typedef void (* ply_event_loop_exit_handler_t) (void *user_data, #ifndef PLY_HIDE_FUNCTION_DECLARATIONS ply_event_loop_t *ply_event_loop_new (void); void ply_event_loop_free (ply_event_loop_t *loop); -bool ply_event_loop_watch_fd (ply_event_loop_t *loop, +void ply_event_loop_watch_fd (ply_event_loop_t *loop, int fd, ply_event_handler_t new_data_handler, ply_event_handler_t disconnected_handler, void *user_data); void ply_event_loop_stop_watching_fd (ply_event_loop_t *loop, int fd); -bool ply_event_loop_watch_signal (ply_event_loop_t *loop, +void ply_event_loop_watch_signal (ply_event_loop_t *loop, int signal_number, ply_event_handler_t signal_handler, void *user_data); |
