mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-06 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

json-pod: add error checking version of json to pod

Browse source 
Add an error checking version of the json to pod converter and use that
in pw-cli to report about json parsing errors.
This commit is contained in:
Wim Taymans 2024-09-23 10:12:56 +02:00
parent 8a8843ba20
commit 4b9db9492e
2 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
spa/include/spa/utils/json-pod.h
View file

@ -135,16 +135,32 @@ static inline int spa_json_to_pod_part(struct spa_pod_builder *b, uint32_t flags
return 0;
}
static inline int spa_json_to_pod(struct spa_pod_builder *b, uint32_t flags,
const struct spa_type_info *info, const char *value, int len)
static inline int spa_json_to_pod_checked(struct spa_pod_builder *b, uint32_t flags,
const struct spa_type_info *info, const char *value, int len,
struct spa_error_location *loc)
{
struct spa_json iter;
const char *val;
int res;
if ((len = spa_json_begin(&iter, value, len, &val)) <= 0)
return -EINVAL;
if (loc)
spa_zero(*loc);
return spa_json_to_pod_part(b, flags, info->type, info, &iter, val, len);
if ((res = spa_json_begin(&iter, value, len, &val)) <= 0)
goto error;
res = spa_json_to_pod_part(b, flags, info->type, info, &iter, val, len);
error:
if (res < 0 && loc)
spa_json_get_error(&iter, value, loc);
return res;
}
static inline int spa_json_to_pod(struct spa_pod_builder *b, uint32_t flags,
const struct spa_type_info *info, const char *value, int len)
{
return spa_json_to_pod_checked(b, flags, info, value, len, NULL);
}
/**