- 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 7caa11318b6b8e661d62e980b8ef2c9c939bfc9b..389a1de530eccf925344702a117d854b6cc82499 100644 (file)
--- 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 492a7637954bf15f55e008d957a70381a337c514..b47e5d9f8e38463873fb25f3815b486b733497c2 100644 (file)
--- 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 8a0e49f5c93a5c8e9757ea6a6171d465978ba3cd..411793c6c2709c2951ac018af37f6140ac1105c8 100644 (file)
--- 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 */