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

fix some signed vs unsigned comparisons

Browse source
This commit is contained in:
Wim Taymans 2018-02-20 18:19:11 +01:00
parent 5f92c152e3
commit 6f61ac9357
10 changed files with 49 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spa/include/spa/param/meta.h
View file

@ -46,7 +46,7 @@ spa_type_param_meta_map(struct spa_type_map *map,
struct spa_type_param_meta *type) struct spa_type_param_meta *type)
{ {
if (type->Meta == 0) { if (type->Meta == 0) {
int i; size_t i;
#define OFF(n) offsetof(struct spa_type_param_meta, n) #define OFF(n) offsetof(struct spa_type_param_meta, n)
static struct { off_t offset; const char *type; } tab[] = { static struct { off_t offset; const char *type; } tab[] = {
{ OFF(Meta), SPA_TYPE_PARAM__Meta }, { OFF(Meta), SPA_TYPE_PARAM__Meta },

30
spa/include/spa/pod/builder.h
View file

@ -77,7 +77,7 @@ static inline void spa_pod_builder_init(struct spa_pod_builder *builder, void *d
static inline void * static inline void *
spa_pod_builder_deref(struct spa_pod_builder *builder, uint32_t ref) spa_pod_builder_deref(struct spa_pod_builder *builder, uint32_t ref)
{ {
if (ref == -1) if (ref == SPA_ID_INVALID)
return NULL; return NULL;
else if (builder->deref) else if (builder->deref)
return builder->deref(builder, ref); 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 static inline uint32_t
spa_pod_builder_raw_padded(struct spa_pod_builder *builder, const void *data, uint32_t size) 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); spa_pod_builder_pad(builder, size);
return ref; 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); 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) 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); 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) 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); 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) 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) spa_pod_builder_write_string(struct spa_pod_builder *builder, const char *str, uint32_t len)
{ {
uint32_t ref = 0; uint32_t ref = 0;
if (spa_pod_builder_raw(builder, str, len) == -1) if (spa_pod_builder_raw(builder, str, len) == SPA_ID_INVALID)
ref = -1; ref = SPA_ID_INVALID;
if (spa_pod_builder_raw(builder, "", 1) == -1) if (spa_pod_builder_raw(builder, "", 1) == SPA_ID_INVALID)
ref = -1; ref = SPA_ID_INVALID;
spa_pod_builder_pad(builder, builder->state.offset); spa_pod_builder_pad(builder, builder->state.offset);
return ref; 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); const struct spa_pod_string p = SPA_POD_STRING_INIT(len+1);
uint32_t ref = spa_pod_builder_raw(builder, &p, sizeof(p)); uint32_t ref = spa_pod_builder_raw(builder, &p, sizeof(p));
if (spa_pod_builder_write_string(builder, str, len) == -1) if (spa_pod_builder_write_string(builder, str, len) == SPA_ID_INVALID)
ref = -1; ref = SPA_ID_INVALID;
return ref; 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); const struct spa_pod_bytes p = SPA_POD_BYTES_INIT(len);
uint32_t ref = spa_pod_builder_raw(builder, &p, sizeof(p)); uint32_t ref = spa_pod_builder_raw(builder, &p, sizeof(p));
if (spa_pod_builder_raw_padded(builder, bytes, len) == -1) if (spa_pod_builder_raw_padded(builder, bytes, len) == SPA_ID_INVALID)
ref = -1; ref = SPA_ID_INVALID;
return ref; return ref;
} }
@ -332,8 +332,8 @@ spa_pod_builder_array(struct spa_pod_builder *builder,
{{child_size, child_type}} {{child_size, child_type}}
}; };
uint32_t ref = spa_pod_builder_raw(builder, &p, sizeof(p)); uint32_t ref = spa_pod_builder_raw(builder, &p, sizeof(p));
if (spa_pod_builder_raw_padded(builder, elems, child_size * n_elems) == -1) if (spa_pod_builder_raw_padded(builder, elems, child_size * n_elems) == SPA_ID_INVALID)
ref = -1; ref = SPA_ID_INVALID;
return ref; return ref;
} }

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

@ -174,6 +174,7 @@ do { \
break; \ break; \
case 'z': \ case 'z': \
va_arg(args, void**); \ va_arg(args, void**); \
/* fallthrough */ \
case 'b': \ case 'b': \
case 'I': \ case 'I': \
case 'i': \ case 'i': \

3
spa/tests/test-ringbuffer.c
View file

@ -378,7 +378,8 @@ static void *loop(void *user_data)
printf("enter thread %d\n", data->n_sources); printf("enter thread %d\n", data->n_sources);
while (data->running) { while (data->running) {
int i, r; uint32_t i;
int r;
/* rebuild */ /* rebuild */
if (data->rebuild_fds) { if (data->rebuild_fds) {

13
src/examples/export-sink.c
View file

@ -106,7 +106,7 @@ struct data {
struct spa_param *params[2]; struct spa_param *params[2];
struct spa_buffer *buffers[32]; struct spa_buffer *buffers[32];
int n_buffers; uint32_t n_buffers;
}; };
static void handle_events(struct data *data) 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) 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++) { for (i = 0; i < SPA_N_ELEMENTS(video_formats); i++) {
if (video_formats[i].format == format) 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) 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++) { for (i = 0; i < SPA_N_ELEMENTS(video_formats); i++) {
if (*SPA_MEMBER(&data->type.video_format, video_formats[i].id, uint32_t) == id) 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); struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node);
SDL_RendererInfo info; SDL_RendererInfo info;
int i, c; uint32_t i, c;
if (*index != 0) if (*index != 0)
return 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 spa_buffer **buffers, uint32_t n_buffers)
{ {
struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node); struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node);
int i; uint32_t i;
for (i = 0; i < n_buffers; i++) for (i = 0; i < n_buffers; i++)
d->buffers[i] = buffers[i]; d->buffers[i] = buffers[i];
d->n_buffers = n_buffers; 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; uint8_t *map;
void *sdata, *ddata; void *sdata, *ddata;
int sstride, dstride, ostride; int sstride, dstride, ostride;
int i; uint32_t i;
uint8_t *src, *dst; uint8_t *src, *dst;
handle_events(d); handle_events(d);

11
src/examples/local-v4l2.c
View file

@ -146,7 +146,7 @@ static struct {
static uint32_t sdl_format_to_id(struct data *data, Uint32 format) 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++) { for (i = 0; i < SPA_N_ELEMENTS(video_formats); i++) {
if (video_formats[i].format == format) 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) 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++) { for (i = 0; i < SPA_N_ELEMENTS(video_formats); i++) {
if (*SPA_MEMBER(&data->type.video_format, video_formats[i].id, uint32_t) == id) 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); struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node);
SDL_RendererInfo info; SDL_RendererInfo info;
int i, c; uint32_t i, c;
if (*index != 0) if (*index != 0)
return 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 spa_buffer **buffers, uint32_t n_buffers)
{ {
struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node); struct data *d = SPA_CONTAINER_OF(node, struct data, impl_node);
int i; uint32_t i;
for (i = 0; i < n_buffers; i++) for (i = 0; i < n_buffers; i++)
d->buffers[i] = buffers[i]; d->buffers[i] = buffers[i];
d->n_buffers = n_buffers; 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; uint8_t *map;
void *sdata, *ddata; void *sdata, *ddata;
int sstride, dstride, ostride; int sstride, dstride, ostride;
int i; uint32_t i;
uint8_t *src, *dst; uint8_t *src, *dst;
buf = d->buffers[d->io->buffer_id]; buf = d->buffers[d->io->buffer_id];

8
src/examples/video-play.c
View file

@ -96,7 +96,7 @@ do_render(struct spa_loop *loop, bool async, uint32_t seq,
uint8_t *map; uint8_t *map;
void *sdata, *ddata; void *sdata, *ddata;
int sstride, dstride, ostride; int sstride, dstride, ostride;
int i; uint32_t i;
uint8_t *src, *dst; uint8_t *src, *dst;
handle_events(data); handle_events(data);
@ -218,7 +218,7 @@ static struct {
static uint32_t sdl_format_to_id(struct data *data, Uint32 format) 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++) { for (i = 0; i < SPA_N_ELEMENTS(video_formats); i++) {
if (video_formats[i].format == format) 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) 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++) { for (i = 0; i < SPA_N_ELEMENTS(video_formats); i++) {
if (*SPA_MEMBER(&data->type.video_format, video_formats[i].id, uint32_t) == id) 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]; uint8_t buffer[1024];
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
SDL_RendererInfo info; SDL_RendererInfo info;
int i, c; uint32_t i, c;
printf("remote state: \"%s\"\n", pw_remote_state_as_string(state)); printf("remote state: \"%s\"\n", pw_remote_state_as_string(state));

2
src/modules/module-audio-dsp.c
View file

@ -188,7 +188,7 @@ static int node_get_port_ids(struct spa_node *node,
uint32_t n_output_ids) uint32_t n_output_ids)
{ {
struct node *n = SPA_CONTAINER_OF(node, struct node, node_impl); 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++) { for (c = i = 0; i < n->n_in_ports && c < n_input_ids; i++) {
if (GET_IN_PORT(n, i)) if (GET_IN_PORT(n, i))

7
src/modules/module-protocol-native/connection.c
View file

@ -44,7 +44,7 @@ struct buffer {
int fds[MAX_FDS]; int fds[MAX_FDS];
uint32_t n_fds; uint32_t n_fds;
off_t offset; size_t offset;
void *data; void *data;
size_t size; size_t size;
@ -413,7 +413,7 @@ pw_protocol_native_connection_begin_proxy(struct pw_protocol_native_connection *
impl->dest_id = proxy->id; impl->dest_id = proxy->id;
impl->opcode = opcode; 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; return &impl->builder;
} }
@ -458,7 +458,8 @@ bool pw_protocol_native_connection_flush(struct pw_protocol_native_connection *c
struct iovec iov[1]; struct iovec iov[1];
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
char cmsgbuf[CMSG_SPACE(MAX_FDS * sizeof(int))]; char cmsgbuf[CMSG_SPACE(MAX_FDS * sizeof(int))];
int *cm, i, fds_len; int *cm;
uint32_t i, fds_len;
struct buffer *buf; struct buffer *buf;
buf = &impl->out; buf = &impl->out;

16
src/modules/module-protocol-native/protocol-native.c
View file

@ -186,7 +186,7 @@ static int core_demarshal_info(void *object, void *data, size_t size)
struct spa_dict props; struct spa_dict props;
struct pw_core_info info; struct pw_core_info info;
struct spa_pod_parser prs; struct spa_pod_parser prs;
int i; uint32_t i;
spa_pod_parser_init(&prs, data, size, 0); spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, 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; struct spa_pod_parser prs;
uint32_t first_id, n_types; uint32_t first_id, n_types;
const char **types; const char **types;
int i; uint32_t i;
spa_pod_parser_init(&prs, data, size, 0); spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, 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; struct spa_pod_parser prs;
uint32_t first_id, n_types; uint32_t first_id, n_types;
const char **types; const char **types;
int i; uint32_t i;
spa_pod_parser_init(&prs, data, size, 0); spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, 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_pod_parser prs;
struct spa_dict props; struct spa_dict props;
struct pw_module_info info; struct pw_module_info info;
int i; uint32_t i;
spa_pod_parser_init(&prs, data, size, 0); spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, 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_pod_parser prs;
struct spa_dict props; struct spa_dict props;
struct pw_factory_info info; struct pw_factory_info info;
int i; uint32_t i;
spa_pod_parser_init(&prs, data, size, 0); spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, 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_pod_parser prs;
struct spa_dict props; struct spa_dict props;
struct pw_node_info info; struct pw_node_info info;
int i; uint32_t i;
spa_pod_parser_init(&prs, data, size, 0); spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, 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_pod_parser prs;
struct spa_dict props; struct spa_dict props;
struct pw_port_info info; struct pw_port_info info;
int i; uint32_t i;
spa_pod_parser_init(&prs, data, size, 0); spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, 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_pod_parser prs;
struct spa_dict props; struct spa_dict props;
struct pw_link_info info = { 0, }; struct pw_link_info info = { 0, };
int i; uint32_t i;
spa_pod_parser_init(&prs, data, size, 0); spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs, if (spa_pod_parser_get(&prs,