From: Wouter Wijngaards Date: Wed, 7 Mar 2018 08:52:18 +0000 (+0000) Subject: - Attempt to remove warning about trailing whitespace. X-Git-Tag: release-1.7.0rc2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b25c475f5a2f5688c64e424b67ee4381bf4e880;p=thirdparty%2Funbound.git - Attempt to remove warning about trailing whitespace. git-svn-id: file:///svn/unbound/trunk@4568 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/daemon/worker.c b/daemon/worker.c index 7caa11318..389a1de53 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -1339,11 +1339,11 @@ lookup_cache: h = query_info_hash(lookup_qinfo, sldns_buffer_read_u16_at(c->buffer, 2)); if((e=slabhash_lookup(worker->env.msg_cache, h, lookup_qinfo, 0))) { /* answer from cache - we have acquired a readlock on it */ - if(answer_from_cache(worker, &qinfo, + if(answer_from_cache(worker, &qinfo, cinfo, &need_drop, &alias_rrset, &partial_rep, - (struct reply_info*)e->data, - *(uint16_t*)(void *)sldns_buffer_begin(c->buffer), - sldns_buffer_read_u16_at(c->buffer, 2), repinfo, + (struct reply_info*)e->data, + *(uint16_t*)(void *)sldns_buffer_begin(c->buffer), + sldns_buffer_read_u16_at(c->buffer, 2), repinfo, &edns)) { /* prefetch it if the prefetch TTL expired. * Note that if there is more than one pass diff --git a/doc/Changelog b/doc/Changelog index 492a76379..b47e5d9f8 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -4,6 +4,7 @@ - patch to log creates keytag queries, from A. Schulze. - patch suggested by Debian lintian: allow to -> allow one to, from A. Schulze. + - Attempt to remove warning about trailing whitespace. 6 March 2018: Wouter - Reverted fix for #3512, this may not be the best way forward; diff --git a/services/cache/dns.c b/services/cache/dns.c index 8a0e49f5c..411793c6c 100644 --- a/services/cache/dns.c +++ b/services/cache/dns.c @@ -870,7 +870,7 @@ dns_cache_lookup(struct module_env* env, return NULL; } -int +int dns_cache_store(struct module_env* env, struct query_info* msgqinf, struct reply_info* msgrep, int is_referral, time_t leeway, int pside, struct regional* region, uint32_t flags) @@ -880,7 +880,7 @@ dns_cache_store(struct module_env* env, struct query_info* msgqinf, rep = reply_info_copy(msgrep, env->alloc, NULL); if(!rep) return 0; - /* ttl must be relative ;i.e. 0..86400 not time(0)+86400. + /* ttl must be relative ;i.e. 0..86400 not time(0)+86400. * the env->now is added to message and RRsets in this routine. */ /* the leeway is used to invalidate other rrsets earlier */