mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-01 17:47:30 +01:00
Code Issues Projects Releases Wiki Activity

common/json: json_add_stringn helper.

Browse source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2020-11-25 13:46:52 +10:30
parent 9361b62e3a
commit c29e290ee6
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/json.c
View file

@ -784,13 +784,19 @@ void json_add_literal(struct json_stream *result, const char *fieldname,
memcpy(dest, literal, strlen(literal)); memcpy(dest, literal, strlen(literal));
} }
void json_add_string(struct json_stream *result, const char *fieldname, const char *value TAKES) void json_add_stringn(struct json_stream *result, const char *fieldname,
const char *value TAKES, size_t value_len)
{ {
json_add_member(result, fieldname, true, "%s", value); json_add_member(result, fieldname, true, "%.*s", (int)value_len, value);
if (taken(value)) if (taken(value))
tal_free(value); tal_free(value);
} }
void json_add_string(struct json_stream *result, const char *fieldname, const char *value TAKES)
{
json_add_stringn(result, fieldname, value, strlen(value));
}
void json_add_bool(struct json_stream *result, const char *fieldname, bool value) void json_add_bool(struct json_stream *result, const char *fieldname, bool value)
{ {
json_add_member(result, fieldname, false, value ? "true" : "false"); json_add_member(result, fieldname, false, value ? "true" : "false");

7
common/json.h
View file

@ -163,6 +163,13 @@ const jsmntok_t *json_delve(const char *buffer,
*/ */
void json_add_string(struct json_stream *result, const char *fieldname, const char *value); void json_add_string(struct json_stream *result, const char *fieldname, const char *value);
/* '"fieldname" : "value[:value_len]"' or '"value[:value_len]"' if
* fieldname is NULL. Turns any non-printable chars into JSON
* escapes, but leaves existing escapes alone.
*/
void json_add_stringn(struct json_stream *result, const char *fieldname,
const char *value TAKES, size_t value_len);
/* '"fieldname" : "value"' or '"value"' if fieldname is NULL. String must /* '"fieldname" : "value"' or '"value"' if fieldname is NULL. String must
* already be JSON escaped as necessary. */ * already be JSON escaped as necessary. */
void json_add_escaped_string(struct json_stream *result, void json_add_escaped_string(struct json_stream *result,