diff --git a/librb/include/rb_event.h b/librb/include/rb_event.h index 84d9d172..a99e485d 100644 --- a/librb/include/rb_event.h +++ b/librb/include/rb_event.h @@ -43,7 +43,7 @@ void rb_event_find_delete(EVH * func, void *); void rb_event_update(struct ev_entry *, time_t freq); void rb_set_back_events(time_t); void rb_dump_events(void (*func) (char *, void *), void *ptr); -void rb_run_event(struct ev_entry *); +void rb_run_one_event(struct ev_entry *); time_t rb_event_next(void); #endif /* INCLUDED_event_h */ diff --git a/librb/src/epoll.c b/librb/src/epoll.c index 1d4d6272..9af4bc67 100644 --- a/librb/src/epoll.c +++ b/librb/src/epoll.c @@ -366,7 +366,7 @@ signalfd_handler(rb_fde_t *F, void *data) #endif if(ev == NULL) continue; - rb_run_event(ev); + rb_run_one_event(ev); } } } @@ -455,7 +455,7 @@ rb_read_timerfd(rb_fde_t *F, void *data) return; } rb_setselect(F, RB_SELECT_READ, rb_read_timerfd, event); - rb_run_event(event); + rb_run_one_event(event); } diff --git a/librb/src/event.c b/librb/src/event.c index cdf41474..f678e3cc 100644 --- a/librb/src/event.c +++ b/librb/src/event.c @@ -194,7 +194,7 @@ rb_event_addish(const char *name, EVH * func, void *arg, time_t delta_ish) void -rb_run_event(struct ev_entry *ev) +rb_run_one_event(struct ev_entry *ev) { rb_strlcpy(last_event_ran, ev->name, sizeof(last_event_ran)); ev->func(ev->arg); diff --git a/librb/src/export-syms.txt b/librb/src/export-syms.txt index 7a1b0cc5..ac2667fc 100644 --- a/librb/src/export-syms.txt +++ b/librb/src/export-syms.txt @@ -143,7 +143,7 @@ rb_rawbuf_get rb_rawbuf_length rb_read rb_recv_fd_buf -rb_run_event +rb_run_one_event rb_select rb_send_fd_buf rb_set_buffers diff --git a/librb/src/kqueue.c b/librb/src/kqueue.c index 98e286b7..74f1bf34 100644 --- a/librb/src/kqueue.c +++ b/librb/src/kqueue.c @@ -277,7 +277,7 @@ rb_select_kqueue(long delay) break; #if defined(EVFILT_TIMER) case EVFILT_TIMER: - rb_run_event(kqout[i].udata); + rb_run_one_event(kqout[i].udata); break; #endif default: diff --git a/librb/src/ports.c b/librb/src/ports.c index 1527a915..ba12e5a4 100644 --- a/librb/src/ports.c +++ b/librb/src/ports.c @@ -162,7 +162,7 @@ rb_select_ports(long delay) } else if(pelst[i].portev_source == PORT_SOURCE_TIMER) { ev = (struct ev_entry *)pelst[i].portev_user; - rb_run_event(ev); + rb_run_one_event(ev); } } return RB_OK; diff --git a/librb/src/sigio.c b/librb/src/sigio.c index d5faa171..0c484626 100644 --- a/librb/src/sigio.c +++ b/librb/src/sigio.c @@ -270,7 +270,7 @@ rb_select_sigio(long delay) struct ev_entry *ev = (struct ev_entry *)si.si_ptr; if(ev == NULL) continue; - rb_run_event(ev); + rb_run_one_event(ev); continue; } #endif