diff --git a/src/test/getdns_context_set_listen_addresses.c b/src/test/getdns_context_set_listen_addresses.c index 9246b640..03ac6340 100644 --- a/src/test/getdns_context_set_listen_addresses.c +++ b/src/test/getdns_context_set_listen_addresses.c @@ -101,9 +101,9 @@ typedef struct tcp_connection { getdns_eventloop_event event; uint8_t *read_buf; - size_t read_buf_len; + ssize_t read_buf_len; uint8_t *read_pos; - size_t to_read; + ssize_t to_read; tcp_to_write *to_write; size_t to_answer; @@ -331,7 +331,7 @@ static void tcp_read_cb(void *userarg) (void) loop->vmt->schedule(loop, conn->fd, DOWNSTREAM_IDLE_TIMEOUT, &conn->event); - if ((bytes_read = read(conn->fd, conn->read_pos, conn->to_read)) == -1) { + if ((bytes_read = read(conn->fd, conn->read_pos, conn->to_read)) < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) return; /* Come back to do the read later */ @@ -705,9 +705,9 @@ static getdns_return_t add_listeners(listen_set *set) break; if (setsockopt(l->fd, SOL_SOCKET, SO_REUSEADDR, - &enable, sizeof(int)) < 0) + &enable, sizeof(int)) < 0) { ; /* Ignore */ - + } if (bind(l->fd, (struct sockaddr *)&l->addr, l->addr_len) == -1) /* IO error */ diff --git a/src/test/getdns_query.c b/src/test/getdns_query.c index 5c98d8f9..4e8b2d4a 100644 --- a/src/test/getdns_query.c +++ b/src/test/getdns_query.c @@ -122,8 +122,8 @@ static int get_rrclass(const char *t) } static getdns_return_t -fill_transport_list(getdns_context *context, char *transport_list_str, - getdns_transport_list_t *transports, size_t *transport_count) +fill_transport_list(char *transport_list_str, + getdns_transport_list_t *transports, size_t *transport_count) { size_t max_transports = *transport_count; *transport_count = 0; @@ -334,6 +334,7 @@ void callback(getdns_context *context, getdns_callback_type_t callback_type, getdns_dict *response, void *userarg, getdns_transaction_t trans_id) { char *response_str; + (void)context; (void)userarg; /* This is a callback with data */; if (response && !quiet && (response_str = json ? @@ -475,7 +476,8 @@ static void parse_config(const char *config_str) getdns_return_t parse_args(int argc, char **argv) { getdns_return_t r = GETDNS_RETURN_GOOD; - size_t i, j, klass; + size_t j; + int i, klass; char *arg, *c, *endptr; int t, print_api_info = 0, print_trust_anchors = 0; getdns_list *upstream_list = NULL; @@ -622,7 +624,7 @@ getdns_return_t parse_args(int argc, char **argv) } rewind(fh); if (fread(config_file, 1, config_file_sz, fh) - != config_file_sz) { + != (size_t)config_file_sz) { fprintf(stderr, "An error occurred whil" "e reading \"%s\": %s\n",argv[i], strerror(errno)); @@ -913,7 +915,7 @@ getdns_return_t parse_args(int argc, char **argv) } getdns_transport_list_t transports[10]; size_t transport_count = sizeof(transports); - if ((r = fill_transport_list(context, argv[i], transports, &transport_count)) || + if ((r = fill_transport_list(argv[i], transports, &transport_count)) || (r = getdns_context_set_dns_transport_list(context, transport_count, transports))){ fprintf(stderr, "Could not set transports\n"); @@ -983,13 +985,13 @@ next: ; if (pubkey_pinset && upstream_count) { getdns_dict *upstream; /* apply the accumulated pubkey pinset to all upstreams: */ - for (i = 0; i < upstream_count; i++) { - if (r = getdns_list_get_dict(upstream_list, i, &upstream), r) { - fprintf(stderr, "Failed to get upstream "PRIsz" when adding pinset\n", i); + for (j = 0; j < upstream_count; j++) { + if (r = getdns_list_get_dict(upstream_list, j, &upstream), r) { + fprintf(stderr, "Failed to get upstream "PRIsz" when adding pinset\n", j); return r; } if (r = getdns_dict_set_list(upstream, "tls_pubkey_pinset", pubkey_pinset), r) { - fprintf(stderr, "Failed to set pubkey pinset on upstream "PRIsz"\n", i); + fprintf(stderr, "Failed to set pubkey pinset on upstream "PRIsz"\n", j); return r; } } diff --git a/src/test/getdns_str2dict.c b/src/test/getdns_str2dict.c index f80df99e..3c894ee6 100644 --- a/src/test/getdns_str2dict.c +++ b/src/test/getdns_str2dict.c @@ -224,7 +224,7 @@ static int _jsmn_get_ipdict(struct mem_funcs *mf, const char *js, jsmntok_t *t, char value_str[3072]; int size = t->end - t->start; - if (size <= 0 || size >= sizeof(value_str)) + if (size <= 0 || size >= (int)sizeof(value_str)) return 0; (void) memcpy(value_str, js + t->start, size); @@ -237,7 +237,8 @@ static int _jsmn_get_ipdict(struct mem_funcs *mf, const char *js, jsmntok_t *t, static int _jsmn_get_data(struct mem_funcs *mf, const char *js, jsmntok_t *t, getdns_bindata **value) { - size_t i, j; + int i; + size_t j; uint8_t h, l; if ((t->end - t->start) < 4 || (t->end - t->start) % 2 == 1 || @@ -273,13 +274,13 @@ static int _jsmn_get_data(struct mem_funcs *mf, const char *js, jsmntok_t *t, return 1; } -static int _jsmn_get_dname(struct mem_funcs *mf, const char *js, jsmntok_t *t, +static int _jsmn_get_dname(const char *js, jsmntok_t *t, getdns_bindata **value) { char value_str[1025]; int size = t->end - t->start; - if (size <= 0 || size >= sizeof(value_str) || js[t->end - 1] != '.') + if (size <= 0 || size >= (int)sizeof(value_str) || js[t->end - 1] != '.') return 0; (void) memcpy(value_str, js + t->start, size); @@ -295,7 +296,7 @@ static int _jsmn_get_ipv4(struct mem_funcs *mf, const char *js, jsmntok_t *t, int size = t->end - t->start; uint8_t buf[4]; - if (size <= 0 || size >= sizeof(value_str)) + if (size <= 0 || size >= (int)sizeof(value_str)) return 0; (void) memcpy(value_str, js + t->start, size); @@ -325,7 +326,7 @@ static int _jsmn_get_ipv6(struct mem_funcs *mf, const char *js, jsmntok_t *t, int size = t->end - t->start; uint8_t buf[16]; - if (size <= 0 || size >= sizeof(value_str)) + if (size <= 0 || size >= (int)sizeof(value_str)) return 0; (void) memcpy(value_str, js + t->start, size); @@ -348,14 +349,13 @@ static int _jsmn_get_ipv6(struct mem_funcs *mf, const char *js, jsmntok_t *t, return 0; } -static int _jsmn_get_int(struct mem_funcs *mf, const char *js, jsmntok_t *t, - uint32_t *value) +static int _jsmn_get_int(const char *js, jsmntok_t *t, uint32_t *value) { char value_str[11]; int size = t->end - t->start; char *endptr; - if (size <= 0 || size >= sizeof(value_str)) + if (size <= 0 || size >= (int)sizeof(value_str)) return 0; (void) memcpy(value_str, js + t->start, size); @@ -367,13 +367,12 @@ static int _jsmn_get_int(struct mem_funcs *mf, const char *js, jsmntok_t *t, static int _getdns_get_const_name_info(const char *name, uint32_t *code); -static int _jsmn_get_const(struct mem_funcs *mf, const char *js, jsmntok_t *t, - uint32_t *value) +static int _jsmn_get_const(const char *js, jsmntok_t *t, uint32_t *value) { char value_str[80]; int size = t->end - t->start; - if (size <= 0 || size >= sizeof(value_str)) + if (size <= 0 || size >= (int)sizeof(value_str)) return 0; (void) memcpy(value_str, js + t->start, size); @@ -407,7 +406,8 @@ static int _jsmn_get_item(struct mem_funcs *mf, const char *js, jsmntok_t *t, static int _jsmn_get_dict(struct mem_funcs *mf, const char *js, jsmntok_t *t, size_t count, getdns_dict *dict, getdns_return_t *r) { - size_t i, j = 1; + int i; + size_t j = 1; char key_spc[1024], *key = NULL; getdns_item child_item; @@ -427,7 +427,7 @@ static int _jsmn_get_dict(struct mem_funcs *mf, const char *js, jsmntok_t *t, *r = GETDNS_RETURN_GENERIC_ERROR; /* range error */ break; } - if (t[j].end - t[j].start < sizeof(key_spc)) + if (t[j].end - t[j].start < (int)sizeof(key_spc)) key = key_spc; else if (!(key = GETDNS_XMALLOC( @@ -485,7 +485,8 @@ static int _jsmn_get_dict(struct mem_funcs *mf, const char *js, jsmntok_t *t, static int _jsmn_get_list(struct mem_funcs *mf, const char *js, jsmntok_t *t, size_t count, getdns_list *list, getdns_return_t *r) { - size_t i, j = 1, index = 0; + int i; + size_t j = 1, index = 0; getdns_item child_item; if (t->size <= 0) @@ -564,13 +565,13 @@ static int _jsmn_get_item(struct mem_funcs *mf, const char *js, jsmntok_t *t, *r = GETDNS_RETURN_GENERIC_ERROR; break; - } else if (_jsmn_get_int(mf, js, t, &item->data.n) - || _jsmn_get_const(mf, js, t, &item->data.n)) { + } else if (_jsmn_get_int(js, t, &item->data.n) + || _jsmn_get_const(js, t, &item->data.n)) { item->dtype = t_int; } else if (_jsmn_get_data(mf, js, t, &item->data.bindata) - || _jsmn_get_dname(mf, js, t, &item->data.bindata) + || _jsmn_get_dname(js, t, &item->data.bindata) || _jsmn_get_ipv4(mf, js, t, &item->data.bindata) || _jsmn_get_ipv6(mf, js, t, &item->data.bindata))