From 7d391b746695d7a262e4f939f057ee1d1685e12b Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Fri, 8 Aug 2014 11:42:51 +1000 Subject: ctdb-logging: Rename ctdb_log_handler() to ctdb_child_log_handler() Now it is obvious that it has something to do with child processes. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/server/ctdb_logging.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ctdb/server/ctdb_logging.c b/ctdb/server/ctdb_logging.c index 25d2722588..c339773831 100644 --- a/ctdb/server/ctdb_logging.c +++ b/ctdb/server/ctdb_logging.c @@ -365,8 +365,9 @@ static void write_to_log(struct ctdb_log_state *log, /* called when log data comes in from a child process */ -static void ctdb_log_handler(struct event_context *ev, struct fd_event *fde, - uint16_t flags, void *private) +static void ctdb_child_log_handler(struct event_context *ev, + struct fd_event *fde, + uint16_t flags, void *private) { struct ctdb_log_state *log = talloc_get_type(private, struct ctdb_log_state); char *p; @@ -484,7 +485,7 @@ struct ctdb_log_state *ctdb_vfork_with_logging(TALLOC_CTX *mem_ctx, set_close_on_exec(log->pfd); talloc_set_destructor(log, log_context_destructor); fde = tevent_add_fd(ctdb->ev, log, log->pfd, EVENT_FD_READ, - ctdb_log_handler, log); + ctdb_child_log_handler, log); tevent_fd_set_auto_close(fde); return log; @@ -541,7 +542,7 @@ int ctdb_set_child_logging(struct ctdb_context *ctdb) close(old_stderr); fde = event_add_fd(ctdb->ev, ctdb->log, p[0], - EVENT_FD_READ, ctdb_log_handler, ctdb->log); + EVENT_FD_READ, ctdb_child_log_handler, ctdb->log); tevent_fd_set_auto_close(fde); ctdb->log->pfd = p[0]; -- cgit