From 6f61ac93578592418a49ca9a5dc30f6a59b39c29 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 20 Feb 2018 18:19:11 +0100 Subject: [PATCH] fix some signed vs unsigned comparisons --- spa/include/spa/param/meta.h | 2 +- spa/include/spa/pod/builder.h | 30 +++++++++---------- spa/include/spa/pod/parser.h | 1 + spa/tests/test-ringbuffer.c | 3 +- src/examples/export-sink.c | 13 ++++---- src/examples/local-v4l2.c | 11 +++---- src/examples/video-play.c | 8 ++--- src/modules/module-audio-dsp.c | 2 +- .../module-protocol-native/connection.c | 7 +++-- .../module-protocol-native/protocol-native.c | 16 +++++----- 10 files changed, 49 insertions(+), 44 deletions(-) diff --git a/spa/include/spa/param/meta.h b/spa/include/spa/param/meta.h index 74cfe76a2..7576ff1a6 100644 --- a/spa/include/spa/param/meta.h +++ b/spa/include/spa/param/meta.h @@ -46,7 +46,7 @@ spa_type_param_meta_map(struct spa_type_map *map, struct spa_type_param_meta *type) { if (type->Meta == 0) { - int i; + size_t i; #define OFF(n) offsetof(struct spa_type_param_meta, n) static struct { off_t offset; const char *type; } tab[] = { { OFF(Meta), SPA_TYPE_PARAM__Meta }, diff --git a/spa/include/spa/pod/builder.h b/spa/include/spa/pod/builder.h index 191acdff4..b9b4ddf5d 100644 --- a/spa/include/spa/pod/builder.h +++ b/spa/include/spa/pod/builder.h @@ -77,7 +77,7 @@ static inline void spa_pod_builder_init(struct spa_pod_builder *builder, void *d static inline void * spa_pod_builder_deref(struct spa_pod_builder *builder, uint32_t ref) { - if (ref == -1) + if (ref == SPA_ID_INVALID) return NULL; else if (builder->deref) return builder->deref(builder, ref); @@ -137,7 +137,7 @@ static inline void spa_pod_builder_pad(struct spa_pod_builder *builder, uint32_t static inline uint32_t spa_pod_builder_raw_padded(struct spa_pod_builder *builder, const void *data, uint32_t size) { - uint32_t ref = size ? spa_pod_builder_raw(builder, data, size) : -1; + uint32_t ref = size ? spa_pod_builder_raw(builder, data, size) : SPA_ID_INVALID; spa_pod_builder_pad(builder, size); return ref; } @@ -187,7 +187,7 @@ static inline uint32_t spa_pod_builder_none(struct spa_pod_builder *builder) return spa_pod_builder_primitive(builder, &p); } -#define SPA_POD_BOOL_INIT(val) (struct spa_pod_bool){ { sizeof(uint32_t), SPA_POD_TYPE_BOOL }, val ? 1 : 0 } +#define SPA_POD_BOOL_INIT(val) (struct spa_pod_bool){ { sizeof(uint32_t), SPA_POD_TYPE_BOOL }, val ? 1 : 0, 0 } static inline uint32_t spa_pod_builder_bool(struct spa_pod_builder *builder, bool val) { @@ -195,7 +195,7 @@ static inline uint32_t spa_pod_builder_bool(struct spa_pod_builder *builder, boo return spa_pod_builder_primitive(builder, &p.pod); } -#define SPA_POD_ID_INIT(val) (struct spa_pod_id){ { sizeof(uint32_t), SPA_POD_TYPE_ID }, val } +#define SPA_POD_ID_INIT(val) (struct spa_pod_id){ { sizeof(uint32_t), SPA_POD_TYPE_ID }, val, 0 } static inline uint32_t spa_pod_builder_id(struct spa_pod_builder *builder, uint32_t val) { @@ -203,7 +203,7 @@ static inline uint32_t spa_pod_builder_id(struct spa_pod_builder *builder, uint3 return spa_pod_builder_primitive(builder, &p.pod); } -#define SPA_POD_INT_INIT(val) (struct spa_pod_int){ { sizeof(uint32_t), SPA_POD_TYPE_INT }, val } +#define SPA_POD_INT_INIT(val) (struct spa_pod_int){ { sizeof(uint32_t), SPA_POD_TYPE_INT }, val, 0 } static inline uint32_t spa_pod_builder_int(struct spa_pod_builder *builder, int32_t val) { @@ -241,10 +241,10 @@ static inline uint32_t spa_pod_builder_write_string(struct spa_pod_builder *builder, const char *str, uint32_t len) { uint32_t ref = 0; - if (spa_pod_builder_raw(builder, str, len) == -1) - ref = -1; - if (spa_pod_builder_raw(builder, "", 1) == -1) - ref = -1; + if (spa_pod_builder_raw(builder, str, len) == SPA_ID_INVALID) + ref = SPA_ID_INVALID; + if (spa_pod_builder_raw(builder, "", 1) == SPA_ID_INVALID) + ref = SPA_ID_INVALID; spa_pod_builder_pad(builder, builder->state.offset); return ref; } @@ -254,8 +254,8 @@ spa_pod_builder_string_len(struct spa_pod_builder *builder, const char *str, uin { const struct spa_pod_string p = SPA_POD_STRING_INIT(len+1); uint32_t ref = spa_pod_builder_raw(builder, &p, sizeof(p)); - if (spa_pod_builder_write_string(builder, str, len) == -1) - ref = -1; + if (spa_pod_builder_write_string(builder, str, len) == SPA_ID_INVALID) + ref = SPA_ID_INVALID; return ref; } @@ -272,8 +272,8 @@ spa_pod_builder_bytes(struct spa_pod_builder *builder, const void *bytes, uint32 { const struct spa_pod_bytes p = SPA_POD_BYTES_INIT(len); uint32_t ref = spa_pod_builder_raw(builder, &p, sizeof(p)); - if (spa_pod_builder_raw_padded(builder, bytes, len) == -1) - ref = -1; + if (spa_pod_builder_raw_padded(builder, bytes, len) == SPA_ID_INVALID) + ref = SPA_ID_INVALID; return ref; } @@ -332,8 +332,8 @@ spa_pod_builder_array(struct spa_pod_builder *builder, {{child_size, child_type}} }; uint32_t ref = spa_pod_builder_raw(builder, &p, sizeof(p)); - if (spa_pod_builder_raw_padded(builder, elems, child_size * n_elems) == -1) - ref = -1; + if (spa_pod_builder_raw_padded(builder, elems, child_size * n_elems) == SPA_ID_INVALID) + ref = SPA_ID_INVALID; return ref; } diff --git a/spa/include/spa/pod/parser.h b/spa/include/spa/pod/parser.h index 7550ec128..8e1ada087 100644 --- a/spa/include/spa/pod/parser.h +++ b/spa/include/spa/pod/parser.h @@ -174,6 +174,7 @@ do { \ break; \ case 'z': \ va_arg(args, void**); \ + /* fallthrough */ \ case 'b': \ case 'I': \ case 'i': \ diff --git a/spa/tests/test-ringbuffer.c b/spa/tests/test-ringbuffer.c index 380e904aa..8ba40bb45 100644 --- a/spa/tests/test-ringbuffer.c +++ b/spa/tests/test-ringbuffer.c @@ -378,7 +378,8 @@ static void *loop(void *user_data) printf("enter thread %d\n", data->n_sources); while (data->running) { - int i, r; + uint32_t i; + int r; /* rebuild */ if (data->rebuild_fds) { diff --git a/src/examples/export-sink.c b/src/examples/export-sink.c index 76259d0d9..2beaf3789 100644 --- a/src/examples/export-sink.c +++ b/src/examples/export-sink.c @@ -106,7 +106,7 @@ struct data { struct spa_param *params[2]; struct spa_buffer *buffers[32]; - int n_buffers; + uint32_t n_buffers; }; static void handle_events(struct data *data) @@ -171,7 +171,7 @@ static struct { static uint32_t sdl_format_to_id(struct data *data, Uint32 format) { - int i; + size_t i; for (i = 0; i < SPA_N_ELEMENTS(video_formats); i++) { if (video_formats[i].format == format) @@ -182,7 +182,7 @@ static uint32_t sdl_format_to_id(struct data *data, Uint32 format) static Uint32 id_to_sdl_format(struct data *data, uint32_t id) { - int i; + size_t i; for (i = 0; i < SPA_N_ELEMENTS(video_formats); i++) { if (*SPA_MEMBER(&data->type.video_format, video_formats[i].id, uint32_t) == id) @@ -281,7 +281,7 @@ static int port_enum_formats(struct spa_node *node, { struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node); SDL_RendererInfo info; - int i, c; + uint32_t i, c; if (*index != 0) return 0; @@ -481,7 +481,8 @@ static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direc struct spa_buffer **buffers, uint32_t n_buffers) { struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node); - int i; + uint32_t i; + for (i = 0; i < n_buffers; i++) d->buffers[i] = buffers[i]; d->n_buffers = n_buffers; @@ -496,7 +497,7 @@ static int do_render(struct spa_loop *loop, bool async, uint32_t seq, uint8_t *map; void *sdata, *ddata; int sstride, dstride, ostride; - int i; + uint32_t i; uint8_t *src, *dst; handle_events(d); diff --git a/src/examples/local-v4l2.c b/src/examples/local-v4l2.c index 01557a9c4..b071af43a 100644 --- a/src/examples/local-v4l2.c +++ b/src/examples/local-v4l2.c @@ -146,7 +146,7 @@ static struct { static uint32_t sdl_format_to_id(struct data *data, Uint32 format) { - int i; + size_t i; for (i = 0; i < SPA_N_ELEMENTS(video_formats); i++) { if (video_formats[i].format == format) @@ -157,7 +157,7 @@ static uint32_t sdl_format_to_id(struct data *data, Uint32 format) static Uint32 id_to_sdl_format(struct data *data, uint32_t id) { - int i; + size_t i; for (i = 0; i < SPA_N_ELEMENTS(video_formats); i++) { if (*SPA_MEMBER(&data->type.video_format, video_formats[i].id, uint32_t) == id) @@ -238,7 +238,7 @@ static int port_enum_formats(struct spa_node *node, { struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node); SDL_RendererInfo info; - int i, c; + uint32_t i, c; if (*index != 0) return 0; @@ -375,7 +375,8 @@ static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direc struct spa_buffer **buffers, uint32_t n_buffers) { struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node); - int i; + uint32_t i; + for (i = 0; i < n_buffers; i++) d->buffers[i] = buffers[i]; d->n_buffers = n_buffers; @@ -390,7 +391,7 @@ static int do_render(struct spa_loop *loop, bool async, uint32_t seq, uint8_t *map; void *sdata, *ddata; int sstride, dstride, ostride; - int i; + uint32_t i; uint8_t *src, *dst; buf = d->buffers[d->io->buffer_id]; diff --git a/src/examples/video-play.c b/src/examples/video-play.c index 1652197d3..bd7920da7 100644 --- a/src/examples/video-play.c +++ b/src/examples/video-play.c @@ -96,7 +96,7 @@ do_render(struct spa_loop *loop, bool async, uint32_t seq, uint8_t *map; void *sdata, *ddata; int sstride, dstride, ostride; - int i; + uint32_t i; uint8_t *src, *dst; handle_events(data); @@ -218,7 +218,7 @@ static struct { static uint32_t sdl_format_to_id(struct data *data, Uint32 format) { - int i; + size_t i; for (i = 0; i < SPA_N_ELEMENTS(video_formats); i++) { if (video_formats[i].format == format) @@ -229,7 +229,7 @@ static uint32_t sdl_format_to_id(struct data *data, Uint32 format) static Uint32 id_to_sdl_format(struct data *data, uint32_t id) { - int i; + size_t i; for (i = 0; i < SPA_N_ELEMENTS(video_formats); i++) { if (*SPA_MEMBER(&data->type.video_format, video_formats[i].id, uint32_t) == id) @@ -311,7 +311,7 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo uint8_t buffer[1024]; struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); SDL_RendererInfo info; - int i, c; + uint32_t i, c; printf("remote state: \"%s\"\n", pw_remote_state_as_string(state)); diff --git a/src/modules/module-audio-dsp.c b/src/modules/module-audio-dsp.c index 140b264ea..0b84b0b2e 100644 --- a/src/modules/module-audio-dsp.c +++ b/src/modules/module-audio-dsp.c @@ -188,7 +188,7 @@ static int node_get_port_ids(struct spa_node *node, uint32_t n_output_ids) { struct node *n = SPA_CONTAINER_OF(node, struct node, node_impl); - int i, c; + uint32_t i, c; for (c = i = 0; i < n->n_in_ports && c < n_input_ids; i++) { if (GET_IN_PORT(n, i)) diff --git a/src/modules/module-protocol-native/connection.c b/src/modules/module-protocol-native/connection.c index 3469088b2..c7ed8dbe9 100644 --- a/src/modules/module-protocol-native/connection.c +++ b/src/modules/module-protocol-native/connection.c @@ -44,7 +44,7 @@ struct buffer { int fds[MAX_FDS]; uint32_t n_fds; - off_t offset; + size_t offset; void *data; size_t size; @@ -413,7 +413,7 @@ pw_protocol_native_connection_begin_proxy(struct pw_protocol_native_connection * impl->dest_id = proxy->id; impl->opcode = opcode; - impl->builder = (struct spa_pod_builder) { NULL, 0, write_pod }; + impl->builder = (struct spa_pod_builder) { NULL, 0, write_pod, }; return &impl->builder; } @@ -458,7 +458,8 @@ bool pw_protocol_native_connection_flush(struct pw_protocol_native_connection *c struct iovec iov[1]; struct cmsghdr *cmsg; char cmsgbuf[CMSG_SPACE(MAX_FDS * sizeof(int))]; - int *cm, i, fds_len; + int *cm; + uint32_t i, fds_len; struct buffer *buf; buf = &impl->out; diff --git a/src/modules/module-protocol-native/protocol-native.c b/src/modules/module-protocol-native/protocol-native.c index 770af5d5e..7567f9fe8 100644 --- a/src/modules/module-protocol-native/protocol-native.c +++ b/src/modules/module-protocol-native/protocol-native.c @@ -186,7 +186,7 @@ static int core_demarshal_info(void *object, void *data, size_t size) struct spa_dict props; struct pw_core_info info; struct spa_pod_parser prs; - int i; + uint32_t i; spa_pod_parser_init(&prs, data, size, 0); if (spa_pod_parser_get(&prs, @@ -266,7 +266,7 @@ static int core_demarshal_update_types_client(void *object, void *data, size_t s struct spa_pod_parser prs; uint32_t first_id, n_types; const char **types; - int i; + uint32_t i; spa_pod_parser_init(&prs, data, size, 0); if (spa_pod_parser_get(&prs, @@ -522,7 +522,7 @@ static int core_demarshal_update_types_server(void *object, void *data, size_t s struct spa_pod_parser prs; uint32_t first_id, n_types; const char **types; - int i; + uint32_t i; spa_pod_parser_init(&prs, data, size, 0); if (spa_pod_parser_get(&prs, @@ -636,7 +636,7 @@ static int module_demarshal_info(void *object, void *data, size_t size) struct spa_pod_parser prs; struct spa_dict props; struct pw_module_info info; - int i; + uint32_t i; spa_pod_parser_init(&prs, data, size, 0); if (spa_pod_parser_get(&prs, @@ -695,7 +695,7 @@ static int factory_demarshal_info(void *object, void *data, size_t size) struct spa_pod_parser prs; struct spa_dict props; struct pw_factory_info info; - int i; + uint32_t i; spa_pod_parser_init(&prs, data, size, 0); if (spa_pod_parser_get(&prs, @@ -759,7 +759,7 @@ static int node_demarshal_info(void *object, void *data, size_t size) struct spa_pod_parser prs; struct spa_dict props; struct pw_node_info info; - int i; + uint32_t i; spa_pod_parser_init(&prs, data, size, 0); if (spa_pod_parser_get(&prs, @@ -889,7 +889,7 @@ static int port_demarshal_info(void *object, void *data, size_t size) struct spa_pod_parser prs; struct spa_dict props; struct pw_port_info info; - int i; + uint32_t i; spa_pod_parser_init(&prs, data, size, 0); if (spa_pod_parser_get(&prs, @@ -1071,7 +1071,7 @@ static int link_demarshal_info(void *object, void *data, size_t size) struct spa_pod_parser prs; struct spa_dict props; struct pw_link_info info = { 0, }; - int i; + uint32_t i; spa_pod_parser_init(&prs, data, size, 0); if (spa_pod_parser_get(&prs,