sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-21 18:04:06 +03:00
Code

ctdb-daemon: Rename enum ctdb_eventscript_call to ctdb_event

Browse Source 
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Amitay Isaacs 2015-10-28 16:54:10 +11:00 committed by Martin Schwenke
parent e7c9e50916
commit f55889d2c9
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/client/ctdb_client.c
View File

@ -4455,7 +4455,7 @@ int switch_from_server_to_client(struct ctdb_context *ctdb, const char *fmt, ...
int ctdb_ctrl_getscriptstatus(struct ctdb_context *ctdb,
struct timeval timeout, uint32_t destnode,
TALLOC_CTX *mem_ctx,
enum ctdb_eventscript_call type,
enum ctdb_event type,
struct ctdb_script_list_old **scripts)
{
int ret;

2
ctdb/include/ctdb_client.h
View File

@ -567,7 +567,7 @@ int switch_from_server_to_client(struct ctdb_context *ctdb,
int ctdb_ctrl_getscriptstatus(struct ctdb_context *ctdb,
struct timeval timeout, uint32_t destnode,
TALLOC_CTX *mem_ctx,
enum ctdb_eventscript_call type,
enum ctdb_event type,
struct ctdb_script_list_old **script_status);
int ctdb_ctrl_report_recd_lock_latency(struct ctdb_context *ctdb,

6
ctdb/include/ctdb_private.h
View File

@ -1082,15 +1082,15 @@ int ctdb_event_script_callback(struct ctdb_context *ctdb,
void (*callback)(struct ctdb_context *,
int, void *),
void *private_data,
enum ctdb_eventscript_call call,
enum ctdb_event call,
const char *fmt, ...) PRINTF_ATTRIBUTE(6,7);
int ctdb_event_script_args(struct ctdb_context *ctdb,
enum ctdb_eventscript_call call,
enum ctdb_event call,
const char *fmt, ...) PRINTF_ATTRIBUTE(3,4);
int ctdb_event_script(struct ctdb_context *ctdb,
enum ctdb_eventscript_call call);
enum ctdb_event call);
int32_t ctdb_run_eventscripts(struct ctdb_context *ctdb,
struct ctdb_req_control *c,

2
ctdb/include/ctdb_protocol.h
View File

@ -232,7 +232,7 @@ struct ctdb_script_list_old {
};
/* different calls to event scripts. */
enum ctdb_eventscript_call {
enum ctdb_event {
CTDB_EVENT_INIT, /* CTDB starting up: no args */
CTDB_EVENT_SETUP, /* CTDB starting up after transport is readdy: no args. */
CTDB_EVENT_STARTUP, /* CTDB starting up after initial recovery: no args. */

24
ctdb/server/eventscript.c
View File

@ -59,7 +59,7 @@ struct ctdb_event_script_state {
struct event_script_callback *callback;
pid_t child;
int fd[2];
enum ctdb_eventscript_call call;
enum ctdb_event call;
const char *options;
struct timeval timeout;
@ -227,7 +227,7 @@ done:
#define MAX_HELPER_ARGS (10)
static bool child_helper_args(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
enum ctdb_eventscript_call call,
enum ctdb_event call,
const char *options,
struct ctdb_script *current, int fd,
int *argc, const char ***argv)
@ -441,7 +441,7 @@ static void ctdb_event_script_handler(struct tevent_context *ev,
struct debug_hung_script_state {
struct ctdb_context *ctdb;
pid_t child;
enum ctdb_eventscript_call call;
enum ctdb_event call;
};
static int debug_hung_script_state_destructor(struct debug_hung_script_state *state)
@ -667,7 +667,7 @@ static unsigned int count_words(const char *options)
return words;
}
static bool check_options(enum ctdb_eventscript_call call, const char *options)
static bool check_options(enum ctdb_event call, const char *options)
{
switch (call) {
/* These all take no arguments. */
@ -689,7 +689,7 @@ static bool check_options(enum ctdb_eventscript_call call, const char *options)
return count_words(options) == 4;
default:
DEBUG(DEBUG_ERR,(__location__ "Unknown ctdb_eventscript_call %u\n", call));
DEBUG(DEBUG_ERR,(__location__ "Unknown ctdb_event %u\n", call));
return false;
}
}
@ -708,7 +708,7 @@ static int ctdb_event_script_callback_v(struct ctdb_context *ctdb,
const void *mem_ctx,
void (*callback)(struct ctdb_context *, int, void *),
void *private_data,
enum ctdb_eventscript_call call,
enum ctdb_event call,
const char *fmt, va_list ap)
{
struct ctdb_event_script_state *state;
@ -716,7 +716,7 @@ static int ctdb_event_script_callback_v(struct ctdb_context *ctdb,
if (ctdb->recovery_mode != CTDB_RECOVERY_NORMAL) {
/* we guarantee that only some specifically allowed event scripts are run
while in recovery */
const enum ctdb_eventscript_call allowed_calls[] = {
const enum ctdb_event allowed_calls[] = {
CTDB_EVENT_INIT,
CTDB_EVENT_SETUP,
CTDB_EVENT_START_RECOVERY,
@ -853,7 +853,7 @@ int ctdb_event_script_callback(struct ctdb_context *ctdb,
TALLOC_CTX *mem_ctx,
void (*callback)(struct ctdb_context *, int, void *),
void *private_data,
enum ctdb_eventscript_call call,
enum ctdb_event call,
const char *fmt, ...)
{
va_list ap;
@ -886,7 +886,7 @@ static void event_script_callback(struct ctdb_context *ctdb, int status, void *p
run the event script, waiting for it to complete. Used when the caller
doesn't want to continue till the event script has finished.
*/
int ctdb_event_script_args(struct ctdb_context *ctdb, enum ctdb_eventscript_call call,
int ctdb_event_script_args(struct ctdb_context *ctdb, enum ctdb_event call,
const char *fmt, ...)
{
va_list ap;
@ -921,7 +921,7 @@ int ctdb_event_script_args(struct ctdb_context *ctdb, enum ctdb_eventscript_call
return status.status;
}
int ctdb_event_script(struct ctdb_context *ctdb, enum ctdb_eventscript_call call)
int ctdb_event_script(struct ctdb_context *ctdb, enum ctdb_event call)
{
/* GCC complains about empty format string, so use %s and "". */
return ctdb_event_script_args(ctdb, call, "%s", "");
@ -961,7 +961,7 @@ static void run_eventscripts_callback(struct ctdb_context *ctdb, int status,
/* Returns rest of string, or NULL if no match. */
static const char *get_call(const char *p, enum ctdb_eventscript_call *call)
static const char *get_call(const char *p, enum ctdb_event *call)
{
unsigned int len;
@ -991,7 +991,7 @@ int32_t ctdb_run_eventscripts(struct ctdb_context *ctdb,
int ret;
struct eventscript_callback_state *state;
const char *options;
enum ctdb_eventscript_call call;
enum ctdb_event call;
/* Figure out what call they want. */
options = get_call((const char *)indata.dptr, &call);

4
ctdb/tools/ctdb.c
View File

@ -1406,7 +1406,7 @@ done:
display the status of the scripts for monitoring (or other events)
*/
static int control_one_scriptstatus(struct ctdb_context *ctdb,
enum ctdb_eventscript_call type)
enum ctdb_event type)
{
struct ctdb_script_list_old *script_status;
int ret, i;
@ -1508,7 +1508,7 @@ static int control_scriptstatus(struct ctdb_context *ctdb,
int argc, const char **argv)
{
int ret;
enum ctdb_eventscript_call type, min, max;
enum ctdb_event type, min, max;
const char *arg;
if (argc > 1) {