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

pod: improve type checks some more

Browse source
This commit is contained in:
Wim Taymans 2025-07-03 15:55:13 +02:00
parent e4fcbef89a
commit 2011474936
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spa/include/spa/pod/iter.h
View file

@ -357,10 +357,11 @@ SPA_API_POD_ITER int spa_pod_is_choice(const struct spa_pod *pod)
SPA_API_POD_ITER struct spa_pod *spa_pod_get_values(const struct spa_pod *pod, uint32_t *n_vals, uint32_t *choice) SPA_API_POD_ITER struct spa_pod *spa_pod_get_values(const struct spa_pod *pod, uint32_t *n_vals, uint32_t *choice)
{ {
if (pod->type == SPA_TYPE_Choice) { if (spa_pod_is_choice(pod)) {
*n_vals = SPA_POD_CHOICE_N_VALUES(pod); *n_vals = SPA_POD_CHOICE_N_VALUES(pod);
if ((*choice = SPA_POD_CHOICE_TYPE(pod)) == SPA_CHOICE_None) *choice = SPA_POD_CHOICE_TYPE(pod);
*n_vals = SPA_MIN(1u, SPA_POD_CHOICE_N_VALUES(pod)); if (*choice == SPA_CHOICE_None)
*n_vals = SPA_MIN(1u, *n_vals);
return (struct spa_pod*)SPA_POD_CHOICE_CHILD(pod); return (struct spa_pod*)SPA_POD_CHOICE_CHILD(pod);
} else { } else {
*n_vals = 1; *n_vals = 1;
@ -371,13 +372,12 @@ SPA_API_POD_ITER struct spa_pod *spa_pod_get_values(const struct spa_pod *pod, u
SPA_API_POD_ITER int spa_pod_is_struct(const struct spa_pod *pod) SPA_API_POD_ITER int spa_pod_is_struct(const struct spa_pod *pod)
{ {
return (SPA_POD_TYPE(pod) == SPA_TYPE_Struct); return SPA_POD_CHECK_0(pod, SPA_TYPE_Struct);
} }
SPA_API_POD_ITER int spa_pod_is_object(const struct spa_pod *pod) SPA_API_POD_ITER int spa_pod_is_object(const struct spa_pod *pod)
{ {
return (SPA_POD_TYPE(pod) == SPA_TYPE_Object && return SPA_POD_CHECK(pod, SPA_TYPE_Object, sizeof(struct spa_pod_object_body));
SPA_POD_BODY_SIZE(pod) >= sizeof(struct spa_pod_object_body));
} }
SPA_API_POD_ITER bool spa_pod_is_object_type(const struct spa_pod *pod, uint32_t type) SPA_API_POD_ITER bool spa_pod_is_object_type(const struct spa_pod *pod, uint32_t type)
@ -392,8 +392,7 @@ SPA_API_POD_ITER bool spa_pod_is_object_id(const struct spa_pod *pod, uint32_t i
SPA_API_POD_ITER int spa_pod_is_sequence(const struct spa_pod *pod) SPA_API_POD_ITER int spa_pod_is_sequence(const struct spa_pod *pod)
{ {
return (SPA_POD_TYPE(pod) == SPA_TYPE_Sequence && return SPA_POD_CHECK(pod, SPA_TYPE_Sequence, sizeof(struct spa_pod_sequence_body));
SPA_POD_BODY_SIZE(pod) >= sizeof(struct spa_pod_sequence_body));
} }
SPA_API_POD_ITER const struct spa_pod_prop *spa_pod_object_find_prop(const struct spa_pod_object *pod, SPA_API_POD_ITER const struct spa_pod_prop *spa_pod_object_find_prop(const struct spa_pod_object *pod,