fix some signed vs unsigned comparisons

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

View file

@ -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);

View file

@ -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];

View file

@ -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));

View file

@ -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))

View file

@ -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;

View file

@ -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,