aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-06 07:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

param: make json_tok_ handlers all return command_result, rename to param_

Browse Source 
Handers of a specific form are both designed to be used as callbacks
for param(), and also dispose of the command if something goes wrong.

Make them return the 'struct command_result *' from command_failed(),
or NULL.  

Renaming them just makes sense: json_tok_XXX is used for non-command-freeing
parsers too.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-12-16 15:20:06 +10:30
parent 93bf7c4839
commit bc41ab2cb9
26 changed files with 630 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lightningd/log.c
View File

@@ -702,9 +702,11 @@ void json_add_log(struct json_stream *response,
json_array_end(info.response);
}
bool json_tok_loglevel(struct command *cmd, const char *name,
const char *buffer, const jsmntok_t *tok,
enum log_level **level)
struct command_result *param_loglevel(struct command *cmd,
const char *name,
const char *buffer,
const jsmntok_t *tok,
enum log_level **level)
{
*level = tal(cmd, enum log_level);
if (json_tok_streq(buffer, tok, "io"))
@@ -716,14 +718,14 @@ bool json_tok_loglevel(struct command *cmd, const char *name,
else if (json_tok_streq(buffer, tok, "unusual"))
**level = LOG_UNUSUAL;
else {
command_fail(cmd, JSONRPC2_INVALID_PARAMS,
"'%s' should be 'io', 'debug', 'info', or "
"'unusual', not '%.*s'",
name,
json_tok_full_len(tok), json_tok_full(buffer, tok));
return false;
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
"'%s' should be 'io', 'debug', 'info', or "
"'unusual', not '%.*s'",
name,
json_tok_full_len(tok),
json_tok_full(buffer, tok));
}
return true;
return NULL;
}
static void json_getlog(struct command *cmd,
@@ -736,8 +738,7 @@ static void json_getlog(struct command *cmd,
struct log_book *lr = cmd->ld->log_book;
if (!param(cmd, buffer, params,
p_opt_def("level", json_tok_loglevel, &minlevel,
LOG_INFORM),
p_opt_def("level", param_loglevel, &minlevel, LOG_INFORM),
NULL))
return;