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

json: simplify json_tok_copy.

Browse Source 
Also fixes NULL case (we called tok_next() before NULL check).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-12-05 12:32:20 +10:30
committed by Christian Decker
parent 0c5f8a3a15
commit 692d8e9685
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/json.c
View File

@@ -251,17 +251,7 @@ void json_tok_print(const char *buffer, const jsmntok_t *tok)
jsmntok_t *json_tok_copy(const tal_t *ctx, const jsmntok_t *tok)
{
const jsmntok_t *first = tok;
const jsmntok_t *last = json_next(tok);
if (!tok)
return NULL;
jsmntok_t *arr = tal_arr(ctx, jsmntok_t, last - first);
jsmntok_t *dest = arr;
while (first != last)
*dest++ = *first++;
return arr;
return tal_dup_arr(ctx, jsmntok_t, tok, json_next(tok) - tok, 0);
}
void json_tok_remove(jsmntok_t **tokens, jsmntok_t *tok, size_t num)