X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdns.c;h=15fa15a79099b1faf28af0a20ef9a629eacc2ad2;hb=6159b6f81403b90eb2b1f1c60fa8006cd3405d1b;hp=fd75dc93a9437fb9bd0d7a580c1937e26f19b859;hpb=24c2f247f6dc5c17b26d715346a380efababb08f;p=collectd.git

diff --git a/src/dns.c b/src/dns.c
index fd75dc93..15fa15a7 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -25,16 +25,15 @@
 #define _BSD_SOURCE
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
 
 #include "utils_dns.h"
-#include <pthread.h>
 #include <poll.h>
 
 #include <pcap.h>
-#include <pcap-bpf.h>
 
 /*
  * Private data types
@@ -95,11 +94,10 @@ static counter_list_t *counter_list_create (counter_list_t **list,
 {
 	counter_list_t *entry;
 
-	entry = (counter_list_t *) malloc (sizeof (counter_list_t));
+	entry = calloc (1, sizeof (*entry));
 	if (entry == NULL)
 		return (NULL);
 
-	memset (entry, 0, sizeof (counter_list_t));
 	entry->key = key;
 	entry->value = value;
 
@@ -213,7 +211,7 @@ static int dns_run_pcap_loop (void)
 {
 	pcap_t *pcap_obj;
 	char    pcap_error[PCAP_ERRBUF_SIZE];
-	struct  bpf_program fp;
+	struct  bpf_program fp = { 0 };
 
 	int status;
 
@@ -240,7 +238,6 @@ static int dns_run_pcap_loop (void)
 		return (PCAP_ERROR);
 	}
 
-	memset (&fp, 0, sizeof (fp));
 	status = pcap_compile (pcap_obj, &fp, "udp port 53", 1, 0);
 	if (status < 0)
 	{
@@ -393,7 +390,6 @@ static int dns_read (void)
 	unsigned int keys[T_MAX];
 	unsigned int values[T_MAX];
 	int len;
-	int i;
 
 	counter_list_t *ptr;
 
@@ -415,7 +411,7 @@ static int dns_read (void)
 	}
 	pthread_mutex_unlock (&qtype_mutex);
 
-	for (i = 0; i < len; i++)
+	for (int i = 0; i < len; i++)
 	{
 		DEBUG ("dns plugin: qtype = %u; counter = %u;", keys[i], values[i]);
 		submit_derive ("dns_qtype", qtype_str (keys[i]), values[i]);
@@ -431,7 +427,7 @@ static int dns_read (void)
 	}
 	pthread_mutex_unlock (&opcode_mutex);
 
-	for (i = 0; i < len; i++)
+	for (int i = 0; i < len; i++)
 	{
 		DEBUG ("dns plugin: opcode = %u; counter = %u;", keys[i], values[i]);
 		submit_derive ("dns_opcode", opcode_str (keys[i]), values[i]);
@@ -447,7 +443,7 @@ static int dns_read (void)
 	}
 	pthread_mutex_unlock (&rcode_mutex);
 
-	for (i = 0; i < len; i++)
+	for (int i = 0; i < len; i++)
 	{
 		DEBUG ("dns plugin: rcode = %u; counter = %u;", keys[i], values[i]);
 		submit_derive ("dns_rcode", rcode_str (keys[i]), values[i]);