aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-08 16:44:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: simplify listconfigs loop.

Browse Source 
Now we can look up the name using opt_find_long, we can do that first,
simplifying this code.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2023-06-01 13:47:21 +09:30
parent f45c17450b
commit 1bb462759d
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lightningd/options.c
View File

@@ -1865,26 +1865,39 @@ static void add_config(struct lightningd *ld,
}
}
static struct command_result *param_opt_config(struct command *cmd,
const char *name,
const char *buffer,
const jsmntok_t *tok,
const struct opt_table **config)
{
const char *name0 = json_strdup(tmpctx, buffer, tok);
*config = opt_find_long(name0, NULL);
if (*config)
return NULL;
return command_fail_badparam(cmd, name, buffer, tok,
"Unknown config option");
}
static struct command_result *json_listconfigs(struct command *cmd,
const char *buffer,
const jsmntok_t *obj UNNEEDED,
const jsmntok_t *params)
{
size_t i;
struct json_stream *response = NULL;
const char *configname;
const struct opt_table *config;
if (!param(cmd, buffer, params,
p_opt("config", param_string, &configname),
p_opt("config", param_opt_config, &config),
NULL))
return command_param_failed();
if (!configname) {
response = json_stream_success(cmd);
response = json_stream_success(cmd);
if (!config)
json_add_string(response, "# version", version());
}
for (i = 0; i < opt_count; i++) {
for (size_t i = 0; i < opt_count; i++) {
unsigned int len;
const char *name;
@@ -1899,26 +1912,15 @@ static struct command_result *json_listconfigs(struct command *cmd,
if (name[0] != '-')
continue;
if (configname
&& !memeq(configname, strlen(configname),
name + 1, len - 1))
continue;
if (!response)
response = json_stream_success(cmd);
add_config(cmd->ld, response, &opt_table[i],
name+1, len-1);
if (!config || config == &opt_table[i]) {
add_config(cmd->ld, response, &opt_table[i],
name+1, len-1);
}
/* If we have more than one long name, first
* is preferred */
break;
}
}
if (configname && !response) {
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
"Unknown config option %s",
configname);
}
return command_success(cmd, response);
}