From 63a3811aa76802e9585e04cf12bf8de617442105 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 18 Feb 2021 12:42:06 +0100 Subject: [PATCH] fix some warnings --- spa/plugins/bluez5/backend-native.c | 2 +- src/examples/media-session/default-routes.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/spa/plugins/bluez5/backend-native.c b/spa/plugins/bluez5/backend-native.c index 4df714088..b4d4e5edf 100644 --- a/spa/plugins/bluez5/backend-native.c +++ b/spa/plugins/bluez5/backend-native.c @@ -437,7 +437,7 @@ static bool rfcomm_hfp_hf(struct spa_source *source, char* buf) struct rfcomm *rfcomm = source->data; struct spa_bt_backend *backend = rfcomm->backend; unsigned int features; - unsigned int gain; + unsigned int SPA_UNUSED gain; unsigned int selected_codec; char* token; char separators[] = "\r\n:"; diff --git a/src/examples/media-session/default-routes.c b/src/examples/media-session/default-routes.c index 915571f93..c61a4dc26 100644 --- a/src/examples/media-session/default-routes.c +++ b/src/examples/media-session/default-routes.c @@ -240,8 +240,7 @@ static char *serialize_props(struct device *dev, const struct spa_pod *param) { struct spa_pod_prop *prop; struct spa_pod_object *obj = (struct spa_pod_object *) param; - float val = 0.0f; - bool b = false, comma = false; + bool comma = false; char *ptr; size_t size; FILE *f; @@ -252,13 +251,21 @@ static char *serialize_props(struct device *dev, const struct spa_pod *param) SPA_POD_OBJECT_FOREACH(obj, prop) { switch (prop->key) { case SPA_PROP_volume: - spa_pod_get_float(&prop->value, &val); + { + float val; + if (spa_pod_get_float(&prop->value, &val) < 0) + continue; fprintf(f, "%s \"volume\": %f", (comma ? "," : ""), val); break; + } case SPA_PROP_mute: - spa_pod_get_bool(&prop->value, &b); + { + bool b; + if (spa_pod_get_bool(&prop->value, &b) < 0) + continue; fprintf(f, "%s \"mute\": %s", (comma ? "," : ""), b ? "true" : "false"); break; + } case SPA_PROP_channelVolumes: { uint32_t i, n_vals; @@ -294,7 +301,8 @@ static char *serialize_props(struct device *dev, const struct spa_pod *param) case SPA_PROP_latencyOffsetNsec: { int64_t delay; - spa_pod_get_long(&prop->value, &delay); + if (spa_pod_get_long(&prop->value, &delay) < 0) + continue; fprintf(f, "%s \"latencyOffsetNsec\": %"PRIi64, (comma ? "," : ""), delay); break; }