aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-24 01:24:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

daemon: make json_get_param() understand which args are compulsory.

Browse Source 
So far only one isn't, so this saves us some checks.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-03-15 17:07:30 +10:30
parent 85147347e2
commit 71c02c7b4c
5 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
daemon/json.c
View File

@@ -195,7 +195,8 @@ const jsmntok_t *json_delve(const char *buffer,
return tok;
}
void json_get_params(const char *buffer, const jsmntok_t param[], ...)
/* FIXME: Return false if unknown params specified, too! */
bool json_get_params(const char *buffer, const jsmntok_t param[], ...)
{
va_list ap;
const char *name;
@@ -213,6 +214,11 @@ void json_get_params(const char *buffer, const jsmntok_t param[], ...)
va_start(ap, param);
while ((name = va_arg(ap, const char *)) != NULL) {
tokptr = va_arg(ap, const jsmntok_t **);
bool compulsory = true;
if (name[0] == '?') {
name++;
compulsory = false;
}
if (param->type == JSMN_ARRAY) {
*tokptr = p;
if (p) {
@@ -229,9 +235,12 @@ void json_get_params(const char *buffer, const jsmntok_t param[], ...)
&& buffer[(*tokptr)->start] == 'n') {
*tokptr = NULL;
}
if (compulsory && !*tokptr)
return false;
}
va_end(ap);
return true;
}
jsmntok_t *json_parse_input(const char *input, int len, bool *valid)