diff options
| author | Martin Schwenke <martin@meltin.net> | 2016-11-25 13:23:11 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2016-12-05 08:09:21 +0100 |
| commit | 2650f37018e36a9d59046098e519a662d394950e (patch) | |
| tree | aecdf125f8c5da249cffc806dc14907e1ce0ebd6 /ctdb/tools | |
| parent | 9b7308b20295f1670c40d46aa087763698a3c1fa (diff) | |
| download | samba-2650f37018e36a9d59046098e519a662d394950e.tar.gz | |
ctdb-logging: Drop enum debug_level
We are switching to Samba-style integer debug levels.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/tools')
| -rw-r--r-- | ctdb/tools/ctdb.c | 6 | ||||
| -rw-r--r-- | ctdb/tools/ctdb_killtcp.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index 59719757df9..1a91d68e29e 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -2278,7 +2278,7 @@ static int control_enable_monitor(TALLOC_CTX *mem_ctx, static int control_setdebug(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb, int argc, const char **argv) { - enum debug_level log_level; + int log_level; int ret; bool found; @@ -2307,7 +2307,7 @@ static int control_setdebug(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb, static int control_getdebug(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb, int argc, const char **argv) { - enum debug_level loglevel; + int loglevel; const char *log_str; int ret; @@ -6468,7 +6468,7 @@ int main(int argc, const char *argv[]) int extra_argc; const struct ctdb_cmd *cmd; const char *ctdb_socket; - enum debug_level loglevel; + int loglevel; int ret; setlinebuf(stdout); diff --git a/ctdb/tools/ctdb_killtcp.c b/ctdb/tools/ctdb_killtcp.c index 9739c2c6294..5db7ec7853b 100644 --- a/ctdb/tools/ctdb_killtcp.c +++ b/ctdb/tools/ctdb_killtcp.c @@ -347,7 +347,7 @@ int main(int argc, char **argv) struct TALLOC_CONTEXT *mem_ctx = NULL; struct ctdb_connection *conns = NULL; const char *t; - enum debug_level debug_level; + int debug_level; bool done; int num = 0; int i, ret; @@ -356,7 +356,9 @@ int main(int argc, char **argv) t = getenv("CTDB_DEBUGLEVEL"); if (t != NULL) { if (debug_level_parse(t, &debug_level)) { - DEBUGLEVEL = debug_level_to_int(debug_level); + DEBUGLEVEL = debug_level; + } else { + DEBUGLEVEL = DEBUG_ERR; } } |