Clean up a bit of cast from type [...] casts away qualifiers" warnings

Obtained with -Wcast-qual.

diff --git a/pdns/dnscrypt.cc b/pdns/dnscrypt.cc
index 9a803958fdff103218a173cac4cb25de4cea8418..74d9182cfc6e972ffa9d93022771670f9aab667a 100644 (file)
--- a/pdns/dnscrypt.cc
+++ b/pdns/dnscrypt.cc
@@ -50,7 +50,7 @@ void DNSCryptPrivateKey::loadFromFile(const std::string& keyFile)
 void DNSCryptPrivateKey::saveToFile(const std::string& keyFile) const
 {
   ofstream file(keyFile);
-  file.write((char*) key, sizeof(key));
+  file.write(reinterpret_cast<const char*>(key), sizeof(key));
   file.close();
 }
 
@@ -247,7 +247,7 @@ void DNSCryptContext::loadCertFromFile(const std::string&filename, DNSCryptCert&
 void DNSCryptContext::saveCertFromFile(const DNSCryptCert& cert, const std::string&filename)
 {
   ofstream file(filename);
-  file.write((char *) &cert, sizeof(cert));
+  file.write(reinterpret_cast<const char *>(&cert), sizeof(cert));
   file.close();
 }
 

diff --git a/pdns/dnsdist-lua-actions.cc b/pdns/dnsdist-lua-actions.cc
index 43f72a178c7f6b5ef31f1e5abadea4d8af5a23fe..e8f94a4c735d5541880894ecb36d2914d8961bd2 100644 (file)
--- a/pdns/dnsdist-lua-actions.cc
+++ b/pdns/dnsdist-lua-actions.cc
@@ -816,7 +816,7 @@ DNSAction::Action SpoofAction::operator()(DNSQuestion* dq, std::string* ruleresu
   }
 
   unsigned int qnameWireLength=0;
-  DNSName ignore((char*)dq->getData().data(), dq->getData().size(), sizeof(dnsheader), false, 0, 0, &qnameWireLength);
+  DNSName ignore(reinterpret_cast<const char*>(dq->getData().data()), dq->getData().size(), sizeof(dnsheader), false, 0, 0, &qnameWireLength);
 
   if (dq->getMaximumSize() < (sizeof(dnsheader) + qnameWireLength + 4 + numberOfRecords*12 /* recordstart */ + totrdatalen)) {
     return Action::None;
@@ -888,7 +888,7 @@ DNSAction::Action SpoofAction::operator()(DNSQuestion* dq, std::string* ruleresu
       dest += sizeof(recordstart);
 
       memcpy(dest,
-             addr.sin4.sin_family == AF_INET ? (void*)&addr.sin4.sin_addr.s_addr : (void*)&addr.sin6.sin6_addr.s6_addr,
+             addr.sin4.sin_family == AF_INET ? reinterpret_cast<const void*>(&addr.sin4.sin_addr.s_addr) : reinterpret_cast<const void*>(&addr.sin6.sin6_addr.s6_addr),
              addr.sin4.sin_family == AF_INET ? sizeof(addr.sin4.sin_addr.s_addr) : sizeof(addr.sin6.sin6_addr.s6_addr));
       dest += (addr.sin4.sin_family == AF_INET ? sizeof(addr.sin4.sin_addr.s_addr) : sizeof(addr.sin6.sin6_addr.s6_addr));
       dq->getHeader()->ancount++;

diff --git a/pdns/dnsdist-snmp.cc b/pdns/dnsdist-snmp.cc
index 0456f0c5f7ff886bda62aab76406d9fec121a2df..4da43eed866b606183e04d0d4572682dda6a2133 100644 (file)
--- a/pdns/dnsdist-snmp.cc
+++ b/pdns/dnsdist-snmp.cc
@@ -468,14 +468,14 @@ bool DNSDistSNMPAgent::sendDNSTrap(const DNSQuestion& dq, const std::string& rea
                             socketFamilyOID,
                             OID_LENGTH(socketFamilyOID),
                             ASN_INTEGER,
-                            (u_char *) &socketFamily,
+                            reinterpret_cast<const u_char*>(&socketFamily),
                             sizeof(socketFamily));
 
   snmp_varlist_add_variable(&varList,
                             socketProtocolOID,
                             OID_LENGTH(socketProtocolOID),
                             ASN_INTEGER,
-                            (u_char *) &socketProtocol,
+                            reinterpret_cast<const u_char*>(&socketProtocol),
                             sizeof(socketProtocol));
 
   snmp_varlist_add_variable(&varList,
@@ -496,21 +496,21 @@ bool DNSDistSNMPAgent::sendDNSTrap(const DNSQuestion& dq, const std::string& rea
                             queryTypeOID,
                             OID_LENGTH(queryTypeOID),
                             ASN_INTEGER,
-                            (u_char *) &queryType,
+                            reinterpret_cast<const u_char*>(&queryType),
                             sizeof(queryType));
 
   snmp_varlist_add_variable(&varList,
                             querySizeOID,
                             OID_LENGTH(querySizeOID),
                             ASN_UNSIGNED,
-                            (u_char *) &querySize,
+                            reinterpret_cast<const u_char*>(&querySize),
                             sizeof(querySize));
 
   snmp_varlist_add_variable(&varList,
                             queryIDOID,
                             OID_LENGTH(queryIDOID),
                             ASN_UNSIGNED,
-                            (u_char *) &queryID,
+                            reinterpret_cast<const u_char*>(&queryID),
                             sizeof(queryID));
 
   snmp_varlist_add_variable(&varList,
@@ -524,14 +524,14 @@ bool DNSDistSNMPAgent::sendDNSTrap(const DNSQuestion& dq, const std::string& rea
                             qClassOID,
                             OID_LENGTH(qClassOID),
                             ASN_UNSIGNED,
-                            (u_char *) &qClass,
+                            reinterpret_cast<const u_char*>(&qClass),
                             sizeof(qClass));
 
   snmp_varlist_add_variable(&varList,
                             qTypeOID,
                             OID_LENGTH(qTypeOID),
                             ASN_UNSIGNED,
-                            (u_char *) &qType,
+                            reinterpret_cast<const u_char*>(&qType),
                             sizeof(qType));
 
   snmp_varlist_add_variable(&varList,

diff --git a/pdns/dnsparser.hh b/pdns/dnsparser.hh
index 80732d6c587a0244c65775a985c125e1daa4fba1..3f39dd3ec5c8c7d88dda7f5881897b469baada94 100644 (file)
--- a/pdns/dnsparser.hh
+++ b/pdns/dnsparser.hh
@@ -451,7 +451,7 @@ class DNSPacketMangler
 {
 public:
   explicit DNSPacketMangler(std::string& packet)
-    : d_packet((char*) packet.c_str()), d_length(packet.length()), d_notyouroffset(12), d_offset(d_notyouroffset)
+    : d_packet(packet.data()), d_length(packet.length()), d_notyouroffset(12), d_offset(d_notyouroffset)
   {}
   DNSPacketMangler(char* packet, size_t length)
     : d_packet(packet), d_length(length), d_notyouroffset(12), d_offset(d_notyouroffset)
@@ -486,7 +486,7 @@ public:
     const char* p = d_packet + d_offset;
     moveOffset(4);
     uint32_t ret;
-    memcpy(&ret, (void*)p, sizeof(ret));
+    memcpy(&ret, p, sizeof(ret));
     return ntohl(ret);
   }
   uint16_t get16BitInt()
@@ -494,7 +494,7 @@ public:
     const char* p = d_packet + d_offset;
     moveOffset(2);
     uint16_t ret;
-    memcpy(&ret, (void*)p, sizeof(ret));
+    memcpy(&ret, p, sizeof(ret));
     return ntohs(ret);
   }
 
@@ -517,7 +517,7 @@ public:
     moveOffset(4);
 
     uint32_t tmp;
-    memcpy(&tmp, (void*) p, sizeof(tmp));
+    memcpy(&tmp, p, sizeof(tmp));
     tmp = ntohl(tmp);
     if (tmp > decrease) {
       tmp -= decrease;

diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index 32073637e1a1a798558624578106ce334cc3a5f6..1820c566bde3116864cc9c59201b2a73fe203755 100644 (file)
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -238,7 +238,7 @@ union ComboAddress {
       return false;
 
     int n=0;
-    const unsigned char*ptr = (unsigned char*) &sin6.sin6_addr.s6_addr;
+    const unsigned char* ptr = reinterpret_cast<const unsigned char*>(&sin6.sin6_addr.s6_addr);
     for(n=0; n < 10; ++n)
       if(ptr[n])
         return false;
@@ -258,7 +258,7 @@ union ComboAddress {
     ret.sin4.sin_family=AF_INET;
     ret.sin4.sin_port=sin4.sin_port;
 
-    const unsigned char*ptr = (unsigned char*) &sin6.sin6_addr.s6_addr;
+    const unsigned char* ptr = reinterpret_cast<const unsigned char*>(&sin6.sin6_addr.s6_addr);
     ptr+=(sizeof(sin6.sin6_addr.s6_addr) - sizeof(ret.sin4.sin_addr.s_addr));
     memcpy(&ret.sin4.sin_addr.s_addr, ptr, sizeof(ret.sin4.sin_addr.s_addr));
     return ret;
@@ -268,7 +268,7 @@ union ComboAddress {
   {
     char host[1024];
     int retval = 0;
-    if(sin4.sin_family && !(retval = getnameinfo((struct sockaddr*) this, getSocklen(), host, sizeof(host),0, 0, NI_NUMERICHOST)))
+    if(sin4.sin_family && !(retval = getnameinfo(reinterpret_cast<const struct sockaddr*>(this), getSocklen(), host, sizeof(host),0, 0, NI_NUMERICHOST)))
       return string(host);
     else
       return "invalid "+string(gai_strerror(retval));
@@ -364,7 +364,7 @@ union ComboAddress {
         index = 128 + index;
       }
 
-      uint8_t *ls_addr = (uint8_t*)sin6.sin6_addr.s6_addr;
+      const uint8_t* ls_addr = reinterpret_cast<const uint8_t*>(sin6.sin6_addr.s6_addr);
       uint8_t byte_idx = index / 8;
       uint8_t bit_idx = index % 8;
 

diff --git a/pdns/misc.cc b/pdns/misc.cc
index 0948803af925873bd8fde81fdb0b08984f62c1b9..b39a36752e7445bec1e6f17208f6a2162aa66190 100644 (file)
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -67,7 +67,7 @@
 
 size_t writen2(int fd, const void *buf, size_t count)
 {
-  const char *ptr = (char*)buf;
+  const char *ptr = reinterpret_cast<const char*>(buf);
   const char *eptr = ptr + count;
 
   ssize_t res;
@@ -165,7 +165,7 @@ size_t writen2WithTimeout(int fd, const void * buffer, size_t len, const struct
 {
   size_t pos = 0;
   do {
-    ssize_t written = write(fd, (char *)buffer + pos, len - pos);
+    ssize_t written = write(fd, reinterpret_cast<const char *>(buffer) + pos, len - pos);
 
     if (written > 0) {
       pos += (size_t) written;
@@ -224,7 +224,7 @@ uint32_t getLong(const unsigned char* p)
 
 uint32_t getLong(const char* p)
 {
-  return getLong((unsigned char *)p);
+  return getLong(reinterpret_cast<const unsigned char *>(p));
 }
 
 static bool ciEqual(const string& a, const string& b)
@@ -726,7 +726,7 @@ int makeIPv4sockaddr(const std::string& str, struct sockaddr_in* ret)
   if(!*(str.c_str() + pos + 1)) // trailing :
     return -1;
 
-  char *eptr = (char*)str.c_str() + str.size();
+  char *eptr = const_cast<char*>(str.c_str()) + str.size();
   int port = strtol(str.c_str() + pos + 1, &eptr, 10);
   if (port < 0 || port > 65535)
     return -1;