mirror of https://github.com/getdnsapi/getdns.git
Some more minor merge fixes
This commit is contained in:
parent
5cc67ff554
commit
3428412629
|
@ -3404,7 +3404,7 @@ _get_context_settings(getdns_context* context)
|
|||
if (!(list = getdns_list_create_with_context(context)))
|
||||
goto error;
|
||||
|
||||
for (i = 0; (int) i < context->namespace_count; ++i) {
|
||||
for (i = 0; i < context->namespace_count; ++i) {
|
||||
if (getdns_list_set_int(list, i,
|
||||
context->namespaces[i])) {
|
||||
getdns_list_destroy(list);
|
||||
|
|
|
@ -1211,7 +1211,7 @@ static size_t _rr_uncompressed_rdata_size(_getdns_rrtype_iter *rr)
|
|||
static size_t _rr_rdata_size(_getdns_rrtype_iter *rr)
|
||||
{
|
||||
const _getdns_rr_def *rr_def;
|
||||
int i;
|
||||
size_t i;
|
||||
|
||||
rr_def = _getdns_rr_def_lookup(gldns_read_uint16(rr->rr_i.rr_type));
|
||||
|
||||
|
|
|
@ -420,7 +420,7 @@ getdns_general_ns(getdns_context *context, getdns_eventloop *loop,
|
|||
getdns_network_req *netreq, **netreq_p;
|
||||
getdns_dns_req *req;
|
||||
getdns_dict *localnames_response;
|
||||
int i;
|
||||
size_t i;
|
||||
|
||||
if (!context || !name || (!callbackfn && !internal_cb))
|
||||
return GETDNS_RETURN_INVALID_PARAMETER;
|
||||
|
|
Loading…
Reference in New Issue