Various tweaks to avoid compiler warnings, submitted by Ruben d'Arco

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2561 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/ednssubnet.cc b/pdns/ednssubnet.cc
index e4ed4f01cfba12b7354b36648eaa7663005c75ee..ee15a0a1e50d908cb900d7465c5c1763b034a75c 100644 (file)
--- a/pdns/ednssubnet.cc
+++ b/pdns/ednssubnet.cc
@@ -40,7 +40,7 @@ bool getEDNSSubnetOptsFromString(const string& options, EDNSSubnetOpts* eso)
   esow.family = ntohs(esow.family);
   //cerr<<"Family when parsing from string: "<<esow.family<<endl;
   ComboAddress address;
-  int octetsin = ((esow.sourceMask - 1)>> 3)+1;
+  unsigned int octetsin = ((esow.sourceMask - 1)>> 3)+1;
   //cerr<<"octetsin:"<<octetsin<<endl;
   if(esow.family == 1) {
     if(options.size() != 4+octetsin)

diff --git a/pdns/packetcache.cc b/pdns/packetcache.cc
index 851a6e6a8736ba1f5a7650ea8beeaa37adc66fd3..3e611377a2842f7b181bf90b0fc8768f984f4c22 100644 (file)
--- a/pdns/packetcache.cc
+++ b/pdns/packetcache.cc
@@ -124,7 +124,7 @@ void PacketCache::insert(DNSPacket *q, DNSPacket *r, unsigned int maxttl)
 
   bool packetMeritsRecursion=d_doRecursion && q->d.rd;
   uint16_t maxReplyLen = q->d_tcp ? 0xffff : q->getMaxReplyLen();
-  int ourttl = packetMeritsRecursion ? d_recursivettl : d_ttl;
+  unsigned int ourttl = packetMeritsRecursion ? d_recursivettl : d_ttl;
   if(maxttl<ourttl)
     ourttl=maxttl;
   insert(q->qdomain, q->qtype, PacketCache::PACKETCACHE, r->getString(), ourttl, -1, packetMeritsRecursion,

diff --git a/pdns/resolver.cc b/pdns/resolver.cc
index ff59af59a960b053a2e4ff622f2b33a1d5c7838a..e0e647bfe5b02c7eb89b859df29de1aca1c65c27 100644 (file)
--- a/pdns/resolver.cc
+++ b/pdns/resolver.cc
@@ -308,7 +308,7 @@ void Resolver::getSoaSerial(const string &ipport, const string &domain, uint32_t
 
 AXFRRetriever::AXFRRetriever(const ComboAddress& remote, const string& domain, const string& tsigkeyname, const string& tsigalgorithm, 
   const string& tsigsecret)
-: d_tsigkeyname(tsigkeyname), d_tsigsecret(tsigsecret), d_nonSignedMessages(0), d_tsigPos(0)
+: d_tsigkeyname(tsigkeyname), d_tsigsecret(tsigsecret), d_tsigPos(0), d_nonSignedMessages(0)
 {
   ComboAddress local;
   if(remote.sin4.sin_family == AF_INET)

diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc
index cb2a3981dcd3bcc818709fe12fc025519ca5b2c9..05362583b347abf0e4cc7f4c2ab9962b0edc047b 100644 (file)
--- a/pdns/ueberbackend.cc
+++ b/pdns/ueberbackend.cc
@@ -352,7 +352,7 @@ void UeberBackend::addNegCache(const Question &q)
 void UeberBackend::addCache(const Question &q, const vector<DNSResourceRecord> &rrs)
 {
   extern PacketCache PC;
-  static int queryttl=::arg().asNum("query-cache-ttl");
+  static unsigned int queryttl=::arg().asNum("query-cache-ttl");
   if(!queryttl)
     return;