mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -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)
{
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 },

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 *
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;
}

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

@ -174,6 +174,7 @@ do { \
break; \
case 'z': \
va_arg(args, void**); \
/* fallthrough */ \
case 'b': \
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);
while (data->running) {
int i, r;
uint32_t i;
int r;
/* rebuild */
if (data->rebuild_fds) {