From 6a26e6dd3fa6a00189b96113a5a464caa12ae098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Tue, 23 Apr 2024 18:58:26 +0200 Subject: [PATCH] treewide: fix some format string issues Use the proper specifier, and cast to a known type where the type is not guaranteed by any standard. See #3975 --- pipewire-jack/src/pipewire-jack.c | 4 ++-- spa/examples/adapter-control.c | 2 +- spa/plugins/support/logger.c | 4 ++-- src/modules/module-protocol-pulse/message.c | 3 ++- src/modules/module-protocol-pulse/pulse-server.c | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c index 3f3508666..f212faace 100644 --- a/pipewire-jack/src/pipewire-jack.c +++ b/pipewire-jack/src/pipewire-jack.c @@ -6514,7 +6514,7 @@ static inline void get_frame_times(struct client *c, struct frame_times *times) u1 = c->jack_position.unique_1; *times = c->jack_times; if (++count == 10) { - pw_log_warn("could not get snapshot %lu %lu", u1, c->jack_position.unique_2); + pw_log_warn("could not get snapshot %" PRIu64 " %" PRIu64, u1, c->jack_position.unique_2); break; } } while (u1 != c->jack_position.unique_2); @@ -6807,7 +6807,7 @@ jack_transport_state_t jack_transport_query (const jack_client_t *client, if (pos != NULL) *pos = c->jack_position; if (++count == 10) { - pw_log_warn("could not get snapshot %lu %lu", u1, c->jack_position.unique_2); + pw_log_warn("could not get snapshot %" PRIu64 " %" PRIu64, u1, c->jack_position.unique_2); break; } } while (u1 != c->jack_position.unique_2); diff --git a/spa/examples/adapter-control.c b/spa/examples/adapter-control.c index 956b4d427..6aa36dfaa 100644 --- a/spa/examples/adapter-control.c +++ b/spa/examples/adapter-control.c @@ -832,7 +832,7 @@ static int negotiate_formats(struct data *data) if ((res = spa_node_port_use_buffers(data->source_node, SPA_DIRECTION_OUTPUT, 0, 0, data->source_buffers, 1)) < 0) return res; - printf("allocated and assigned buffer(%ld) to source node %p\n", buffer_size, data->source_node); + printf("allocated and assigned buffer (%zu) to source node %p\n", buffer_size, data->source_node); if ((res = spa_node_port_use_buffers(data->sink_node, SPA_DIRECTION_INPUT, 0, 0, data->source_buffers, 1)) < 0) return res; diff --git a/spa/plugins/support/logger.c b/spa/plugins/support/logger.c index af3e2dc1a..1df503cc8 100644 --- a/spa/plugins/support/logger.c +++ b/spa/plugins/support/logger.c @@ -92,8 +92,8 @@ impl_log_logtv(void *object, if (impl->timestamp) { struct timespec now; clock_gettime(CLOCK_MONOTONIC_RAW, &now); - spa_scnprintf(timestamp, sizeof(timestamp), "[%05lu.%06lu]", - (now.tv_sec & 0x1FFFFFFF) % 100000, now.tv_nsec / 1000); + spa_scnprintf(timestamp, sizeof(timestamp), "[%05jd.%06jd]", + (intmax_t) (now.tv_sec & 0x1FFFFFFF) % 100000, (intmax_t) now.tv_nsec / 1000); } if (topic && topic->topic) diff --git a/src/modules/module-protocol-pulse/message.c b/src/modules/module-protocol-pulse/message.c index e6dc2b302..c2542ae4d 100644 --- a/src/modules/module-protocol-pulse/message.c +++ b/src/modules/module-protocol-pulse/message.c @@ -754,7 +754,8 @@ int message_dump(enum spa_log_level level, const char *prefix, struct message *m struct timeval tv; if ((res = read_timeval(m, &tv)) < 0) return res; - pw_log(level, "%s %u: timeval: %lu:%lu", prefix, o, tv.tv_sec, tv.tv_usec); + pw_log(level, "%s %u: timeval: %jd:%jd", prefix, o, + (intmax_t) tv.tv_sec, (intmax_t) tv.tv_usec); break; } case TAG_CHANNEL_MAP: diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c index d7e4e10ab..bb958f282 100644 --- a/src/modules/module-protocol-pulse/pulse-server.c +++ b/src/modules/module-protocol-pulse/pulse-server.c @@ -204,7 +204,7 @@ static int send_object_event(struct client *client, struct pw_manager_object *o, { uint32_t event = 0, mask = 0, res_index = o->index; - pw_log_debug("index:%d id:%d %08lx type:%u", o->index, o->id, o->change_mask, type); + pw_log_debug("index:%d id:%d %08" PRIx64 " type:%u", o->index, o->id, o->change_mask, type); if (pw_manager_object_is_sink(o) && o->change_mask & PW_MANAGER_OBJECT_FLAG_SINK) { client_queue_subscribe_event(client,