From 1d68bb35b2799514c1c99d49113ddfbadfa076e7 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 24 Nov 2009 11:08:39 +1030 Subject: eventscript: typo cleanups 1) ctdb_event_script_v doesn't take varargs. ctdb_run_event_script is a better name, and fix comment. 2) Fix indentation on allowed_scripts. 3) Comment on run_eventscripts_callback is wrong; it's the callback for any ctdb forced event. Signed-off-by: Rusty Russell (This used to be ctdb commit e7d57d7ae678b24dab3364a348838c6a3398942c) --- ctdb/server/eventscript.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c index 0830f4a729..f32ffc02ba 100644 --- a/ctdb/server/eventscript.c +++ b/ctdb/server/eventscript.c @@ -443,11 +443,11 @@ static struct ctdb_script_list *ctdb_get_script_list(struct ctdb_context *ctdb, /* - run the event script - varargs version + Actually run the event script this function is called and run in the context of a forked child which allows it to do blocking calls such as system() */ -static int ctdb_event_script_v(struct ctdb_context *ctdb, const char *options) +static int ctdb_run_event_script(struct ctdb_context *ctdb, const char *options) { char *cmdstr; int ret; @@ -814,7 +814,7 @@ static int ctdb_event_script_callback_v(struct ctdb_context *ctdb, close(state->fd[0]); set_close_on_exec(state->fd[1]); - rt = ctdb_event_script_v(ctdb, state->options); + rt = ctdb_run_event_script(ctdb, state->options); /* We must be able to write PIPEBUF bytes at least; if this somehow fails, the read above will be short. */ write(state->fd[1], &rt, sizeof(rt)); -- cgit