shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-10 00:58:20 +03:00
Code

shared/json: allow json_variant_dump() to return an error

Browse Source 
(cherry picked from commit 7922ead507e0d83e4ec72a8cbd2b67194766e58c)
(cherry picked from commit 219272f7b2afcd7f86abbd04360a07b0d5e1c849)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-10-18 18:09:06 +02:00
parent e797ec736d
commit 1c40f074fa
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/shared/json.c
View File

@ -1771,9 +1771,9 @@ int json_variant_format(JsonVariant *v, JsonFormatFlags flags, char **ret) {
return (int) sz - 1; return (int) sz - 1;
} }
void json_variant_dump(JsonVariant *v, JsonFormatFlags flags, FILE *f, const char *prefix) { int json_variant_dump(JsonVariant *v, JsonFormatFlags flags, FILE *f, const char *prefix) {
if (!v) if (!v)
return; return 0;
if (!f) if (!f)
f = stdout; f = stdout;
@ -1799,7 +1799,8 @@ void json_variant_dump(JsonVariant *v, JsonFormatFlags flags, FILE *f, const cha
fputc('\n', f); /* In case of SSE add a second newline */ fputc('\n', f); /* In case of SSE add a second newline */
if (flags & JSON_FORMAT_FLUSH) if (flags & JSON_FORMAT_FLUSH)
fflush(f); return fflush_and_check(f);
return 0;
} }
int json_variant_filter(JsonVariant **v, char **to_remove) { int json_variant_filter(JsonVariant **v, char **to_remove) {

2
src/shared/json.h
View File

@ -195,7 +195,7 @@ typedef enum JsonFormatFlags {
} JsonFormatFlags; } JsonFormatFlags;
int json_variant_format(JsonVariant *v, JsonFormatFlags flags, char **ret); int json_variant_format(JsonVariant *v, JsonFormatFlags flags, char **ret);
void json_variant_dump(JsonVariant *v, JsonFormatFlags flags, FILE *f, const char *prefix); int json_variant_dump(JsonVariant *v, JsonFormatFlags flags, FILE *f, const char *prefix);
int json_variant_filter(JsonVariant **v, char **to_remove); int json_variant_filter(JsonVariant **v, char **to_remove);