interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Final for loop initializations elimination

This commit is contained in:
Willem Toorop 2017-09-01 16:50:31 +02:00
parent 70ec5ea4d0
commit bf23968226
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/context.c
View File

@ -1116,7 +1116,8 @@ set_os_defaults_windows(struct getdns_context *context)
ptr = &info->DnsServerList; ptr = &info->DnsServerList;
*domain = 0; *domain = 0;
while (ptr) { while (ptr) {
for (size_t i = 0; i < GETDNS_UPSTREAM_TRANSPORTS; i++) { size_t i;
for (i = 0; i < GETDNS_UPSTREAM_TRANSPORTS; i++) {
char *port_str = getdns_port_str_array[i]; char *port_str = getdns_port_str_array[i];
if ((s = getaddrinfo(ptr->IpAddress.String, port_str, &hints, &result))) if ((s = getaddrinfo(ptr->IpAddress.String, port_str, &hints, &result)))
continue; continue;
@ -1209,6 +1210,8 @@ set_os_defaults(struct getdns_context *context)
*domain = 0; *domain = 0;
while (fgets(line, (int)sizeof(line), in)) { while (fgets(line, (int)sizeof(line), in)) {
size_t i;
line[sizeof(line)-1] = 0; line[sizeof(line)-1] = 0;
/* parse = line + strspn(line, " \t"); */ /* No leading whitespace */ /* parse = line + strspn(line, " \t"); */ /* No leading whitespace */
parse = line; parse = line;
@ -1248,7 +1251,7 @@ set_os_defaults(struct getdns_context *context)
token = parse + strcspn(parse, " \t\r\n"); token = parse + strcspn(parse, " \t\r\n");
*token = 0; *token = 0;
for (size_t i = 0; i < GETDNS_UPSTREAM_TRANSPORTS; i++) { for (i = 0; i < GETDNS_UPSTREAM_TRANSPORTS; i++) {
char *port_str = getdns_port_str_array[i]; char *port_str = getdns_port_str_array[i];
if ((s = getaddrinfo(parse, port_str, &hints, &result))) if ((s = getaddrinfo(parse, port_str, &hints, &result)))
continue; continue;
@ -2001,6 +2004,9 @@ getdns_set_base_dns_transports(
static getdns_return_t static getdns_return_t
set_ub_dns_transport(struct getdns_context* context) { set_ub_dns_transport(struct getdns_context* context) {
int fallback;
size_t i;
/* These mappings are not exact because Unbound is configured differently, /* These mappings are not exact because Unbound is configured differently,
so just map as close as possible. Not all options can be supported.*/ so just map as close as possible. Not all options can be supported.*/
switch (context->dns_transports[0]) { switch (context->dns_transports[0]) {
@ -2020,8 +2026,8 @@ set_ub_dns_transport(struct getdns_context* context) {
set_ub_string_opt(context, "do-udp:", "no"); set_ub_string_opt(context, "do-udp:", "no");
set_ub_string_opt(context, "do-tcp:", "yes"); set_ub_string_opt(context, "do-tcp:", "yes");
/* Find out if there is a fallback available. */ /* Find out if there is a fallback available. */
int fallback = 0; fallback = 0;
for (size_t i = 1; i < context->dns_transport_count; i++) { for (i = 1; i < context->dns_transport_count; i++) {
if (context->dns_transports[i] == GETDNS_TRANSPORT_TCP) { if (context->dns_transports[i] == GETDNS_TRANSPORT_TCP) {
fallback = 1; fallback = 1;
break; break;
@ -2693,6 +2699,8 @@ getdns_context_set_upstream_recursive_servers(struct getdns_context *context,
uint8_t tsig_dname_spc[256], *tsig_dname; uint8_t tsig_dname_spc[256], *tsig_dname;
size_t tsig_dname_len; size_t tsig_dname_len;
size_t j
if ((r = getdns_list_get_dict(upstream_list, i, &dict))) { if ((r = getdns_list_get_dict(upstream_list, i, &dict))) {
dict = NULL; dict = NULL;
@ -2814,7 +2822,7 @@ getdns_context_set_upstream_recursive_servers(struct getdns_context *context,
*/ */
/* Loop to create upstreams as needed*/ /* Loop to create upstreams as needed*/
for (size_t j = 0; j < GETDNS_UPSTREAM_TRANSPORTS; j++) { for (j = 0; j < GETDNS_UPSTREAM_TRANSPORTS; j++) {
uint32_t port; uint32_t port;
struct addrinfo *ai; struct addrinfo *ai;
port = getdns_port_array[j]; port = getdns_port_array[j];

3
src/test/tests_stub_async.c
View File

@ -155,7 +155,8 @@ main(int argc, char** argv)
return_value); return_value);
return (GETDNS_RETURN_GENERIC_ERROR); return (GETDNS_RETURN_GENERIC_ERROR);
} }
for (size_t i = 0; i < transport_count; i++) { size_t i;
for (i = 0; i < transport_count; i++) {
fprintf(stderr, "Transport %d is %d\n", (int)i, get_transport_list[i]); fprintf(stderr, "Transport %d is %d\n", (int)i, get_transport_list[i]);
} }
free(get_transport_list); free(get_transport_list);