mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

*: Avoid macros that use casts where possible

Browse source 
Use direct field access when the type is known, instead of a macro that
includes a cast.

These were missed in e4fcbef89a.
This commit is contained in:
Demi Marie Obenour 2025-06-07 15:21:37 -04:00 • committed by Wim Taymans
parent 5cf84fa3fe
commit b3bf5be1f6
11 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spa/include/spa/debug/format.h
View file

@ -128,7 +128,7 @@ SPA_API_DEBUG_FORMAT int spa_debugc_format(struct spa_debug_context *ctx, int in
if (info == NULL) if (info == NULL)
info = spa_type_format; info = spa_type_format;
if (format == NULL || SPA_POD_TYPE(format) != SPA_TYPE_Object) if (format == NULL || format->type != SPA_TYPE_Object)
return -EINVAL; return -EINVAL;
if (spa_format_parse(format, &mtype, &mstype) < 0) if (spa_format_parse(format, &mtype, &mstype) < 0)

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

@ -270,7 +270,7 @@ SPA_API_POD_ITER int spa_pod_get_bytes(const struct spa_pod *pod, const void **v
if (!spa_pod_is_bytes(pod)) if (!spa_pod_is_bytes(pod))
return -EINVAL; return -EINVAL;
*value = (const void *)SPA_POD_CONTENTS(struct spa_pod_bytes, pod); *value = (const void *)SPA_POD_CONTENTS(struct spa_pod_bytes, pod);
*len = SPA_POD_BODY_SIZE(pod); *len = pod->size;
return 0; return 0;
} }

2
spa/include/spa/pod/parser.h
View file

@ -281,7 +281,7 @@ SPA_API_POD_PARSER bool spa_pod_parser_can_collect(const struct spa_pod *pod, ch
if (pod == NULL) if (pod == NULL)
return false; return false;
if (SPA_POD_TYPE(pod) == SPA_TYPE_Choice) { if (pod->type == SPA_TYPE_Choice) {
if (!spa_pod_is_choice(pod)) if (!spa_pod_is_choice(pod))
return false; return false;
if (type == 'V') if (type == 'V')

2
spa/plugins/audioconvert/audioadapter.c
View file

@ -918,7 +918,7 @@ static struct spa_pod *merge_objects(struct impl *this, struct spa_pod_builder *
struct spa_pod_builder_state state; struct spa_pod_builder_state state;
int res = 0; int res = 0;
if (o2 == NULL || SPA_POD_TYPE(o1) != SPA_POD_TYPE(o2)) if (o2 == NULL || o1->pod.type != o2->pod.type)
return (struct spa_pod*)o1; return (struct spa_pod*)o1;
spa_pod_builder_push_object(b, &f, o1->body.type, o1->body.id); spa_pod_builder_push_object(b, &f, o1->body.type, o1->body.id);

2
spa/plugins/v4l2/v4l2-utils.c
View file

@ -1585,7 +1585,7 @@ spa_v4l2_set_control(struct impl *this, uint32_t id,
if ((res = spa_v4l2_open(dev, this->props.device)) < 0) if ((res = spa_v4l2_open(dev, this->props.device)) < 0)
return res; return res;
switch (SPA_POD_TYPE(&prop->value)) { switch (prop->value.type) {
case SPA_TYPE_Bool: case SPA_TYPE_Bool:
{ {
bool val; bool val;

2
spa/plugins/videoconvert/videoadapter.c
View file

@ -969,7 +969,7 @@ static struct spa_pod *merge_objects(struct impl *this, struct spa_pod_builder *
struct spa_pod_builder_state state; struct spa_pod_builder_state state;
int res = 0; int res = 0;
if (o2 == NULL || SPA_POD_TYPE(o1) != SPA_POD_TYPE(o2)) if (o2 == NULL || o1->pod.type != o2->pod.type)
return (struct spa_pod*)o1; return (struct spa_pod*)o1;
spa_pod_builder_push_object(b, &f, o1->body.type, o1->body.id); spa_pod_builder_push_object(b, &f, o1->body.type, o1->body.id);

2
spa/plugins/videoconvert/videoconvert-ffmpeg.c
View file

@ -1286,7 +1286,7 @@ static int diff_prop(struct impl *impl, struct spa_pod_prop *prop,
void *vals, *v, *best = NULL; void *vals, *v, *best = NULL;
int res = INT_MAX; int res = INT_MAX;
if (SPA_POD_TYPE(val) != type) if (val->type != type)
return -EINVAL; return -EINVAL;
size = SPA_POD_BODY_SIZE(val); size = SPA_POD_BODY_SIZE(val);

13
src/modules/module-protocol-native/v0/protocol-native.c
View file

@ -646,10 +646,11 @@ struct spa_pod * pw_protocol_native0_pod_from_v2(struct pw_impl_client *client,
if (pod == NULL) if (pod == NULL)
return NULL; return NULL;
if ((res = remap_from_v2(SPA_POD_TYPE(pod), if ((res = remap_from_v2(pod->type,
SPA_POD_BODY(pod), SPA_POD_BODY(pod),
SPA_POD_BODY_SIZE(pod), pod->size,
client, &b)) < 0) { client,
&b)) < 0) {
errno = -res; errno = -res;
return NULL; return NULL;
} }
@ -669,9 +670,9 @@ int pw_protocol_native0_pod_to_v2(struct pw_impl_client *client, const struct sp
} }
if ((res = remap_to_v2(client, pw_type_info(), if ((res = remap_to_v2(client, pw_type_info(),
SPA_POD_TYPE(pod), pod->type,
SPA_POD_BODY(pod), SPA_POD_BODY(pod),
SPA_POD_BODY_SIZE(pod), pod->size,
b)) < 0) { b)) < 0) {
return -res; return -res;
} }

4
src/modules/module-protocol-pulse/collect.c
View file

@ -524,8 +524,8 @@ uint32_t collect_transport_codec_info(struct pw_manager_object *card,
if (iid != SPA_PROP_bluetoothAudioCodec) if (iid != SPA_PROP_bluetoothAudioCodec)
continue; continue;
if (SPA_POD_CHOICE_TYPE(type) != SPA_CHOICE_Enum || if (type->body.type != SPA_CHOICE_Enum ||
SPA_POD_TYPE(SPA_POD_CHOICE_CHILD(type)) != SPA_TYPE_Int) type->body.child.type != SPA_TYPE_Int)
continue; continue;
/* /*

2
src/pipewire/stream.c
View file

@ -1278,7 +1278,7 @@ static int node_event_param(void *object, int seq,
return -EINVAL; return -EINVAL;
} }
c->type = SPA_POD_TYPE(pod); c->type = pod->type;
if (spa_pod_is_float(pod)) if (spa_pod_is_float(pod))
vals = SPA_POD_BODY(pod); vals = SPA_POD_BODY(pod);
else if (spa_pod_is_double(pod)) { else if (spa_pod_is_double(pod)) {

6
src/tools/pw-dump.c
View file

@ -511,10 +511,8 @@ static void put_pod(struct data *d, const char *key, const struct spa_pod *pod)
if (pod == NULL) { if (pod == NULL) {
put_value(d, key, NULL); put_value(d, key, NULL);
} else { } else {
put_pod_value(d, key, SPA_TYPE_ROOT, put_pod_value(d, key, SPA_TYPE_ROOT, pod->type,
SPA_POD_TYPE(pod), SPA_POD_BODY(pod), pod->size);
SPA_POD_BODY(pod),
SPA_POD_BODY_SIZE(pod));
} }
} }