← Back to branch summary

~ubuntu-branches/ubuntu/wily/maradns/wily-proposed

« back to all changes in this revision

Viewing changes to deadwood-3.2.07/update/3.2.06/deadwood-3.2.05-GCC482.patch

  • Committer: Package Import Robot
  • Author(s): Dariusz Dwornikowski, Tomasz Buchert, Dariusz Dwornikowski
  • Date: 2015-03-27 18:34:08 UTC
  • mfrom: (1.2.12)
  • Revision ID: package-import@ubuntu.com-20150327183408-wnfachdkdjt96yu6
Tags: 2.0.11-1
http://bugs.debian.org/785536
http://bugs.debian.org/785535
[ Tomasz Buchert ]
* Imported Upstream version 2.0.11

[ Dariusz Dwornikowski ]
* d/patches: 
  - refreshed all patches for new deadwood version
  - removed generating of random prime on build (Closes: #785536) 
* d/rules: date taken from changelog (Closes: #785535)

Show diffs side-by-side

added added

removed removed

Lines of Context:
deadwood-3.2.07/update/3.2.06/deadwood-3.2.05-GCC482.patch
 
1
Removed two warnings generated by GCC 4.8.2
 
2
 
 
3
diff --git a/deadwood-github/src/DwRecurse.c b/deadwood-github/src/DwRecurse.c
 
4
index 12f646f..4a5f831 100644
 
5
--- a/deadwood-github/src/DwRecurse.c
 
6
+++ b/deadwood-github/src/DwRecurse.c
 
7
@@ -1906,10 +1906,9 @@ void dwx_add_final_answer(dw_str *query, dw_str *answer, dw_str *value,
 
8
  * to a SOA "not there" reply. */
 
9
 dw_str *dwx_alt_cname_reply(dw_str *query, dw_str *action, dw_str *answer,
 
10
                 int32_t ttl) {
 
11
-        int len = 0, place = 0, type = 0;
 
12
+        int len = 0, place = 0;
 
13
         dw_str *value = 0;
 
14
 
 
15
-        type = dw_fetch_u8(answer,-1);
 
16
         /* We will just give the stub resolver our first CNAME link */
 
17
         value = dwx_make_one_cname_rr(query, 0, action, 2, ttl, &len, 260);
 
18
         place = dw_get_dn_end(value, 0);
 
19
diff --git a/deadwood-github/src/DwUdpSocket.c b/deadwood-github/src/DwUdpSocket.c
 
20
index 93ff315..0845d5b 100644
 
21
--- a/deadwood-github/src/DwUdpSocket.c
 
22
+++ b/deadwood-github/src/DwUdpSocket.c
 
23
@@ -795,11 +795,10 @@ int cache_dns_reply(unsigned char *packet, int count, int b, int truncated) {
 
24
         int is_nxdomain = 0;
 
25
         dw_str *question = 0, *answer = 0;
 
26
         dw_str *decomp = 0;
 
27
-        int ret = -1, qtype = -1;
 
28
+        int ret = -1;
 
29
 
 
30
         question = dw_get_dname_type(packet,12,count);
 
31
         dwc_lower_case(question);
 
32
-        qtype = dw_fetch_u16(question,-1);
 
33
         dw_log_dwstr("Caching a reply for query ",question,1000);
 
34
         if((packet[3] & 0x0f) == 2) { /* Server FAIL */
 
35
                 ret = -1; /* Bad return value; do not cache */
 
36