From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 7 Mar 2018 08:52:49 +0000 (+0000)
Subject: - Attempt to remove warning about trailing whitespace.
X-Git-Tag: release-1.7.0rc2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5fbb38fe26cdc1ae9081a41afa1741a13191ec4;p=thirdparty%2Funbound.git

- Attempt to remove warning about trailing whitespace.


git-svn-id: file:///svn/unbound/trunk@4569 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/contrib/fastrpz.patch b/contrib/fastrpz.patch
index 6f11cfb28..6e78bf1b7 100644
--- a/contrib/fastrpz.patch
+++ b/contrib/fastrpz.patch
@@ -228,12 +228,12 @@ Index: unbound-1.7.0~rc1/daemon/worker.c
  		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, 
-+			ret = answer_from_cache(worker, &qinfo, 
+-			if(answer_from_cache(worker, &qinfo,
++			ret = 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)) {
 +				&edns);
 +#ifdef ENABLE_FASTRPZ
@@ -3118,7 +3118,7 @@ Index: unbound-1.7.0~rc1/services/cache/dns.c
  	struct regional* region, uint32_t flags)
  {
  	struct reply_info* rep = NULL;
-+	
++
 +#ifdef ENABLE_FASTRPZ
 +	/* Never save RPZ rewritten data. */
 +	if (msgrep->security == sec_status_rpz_drop ||