From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 20 Aug 2013 05:46:15 +0000 (+0200)
Subject: please lint
X-Git-Tag: release-1.6.17rc1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a5e1286535df0ddd50a2bb21ae806ed9c6df717;p=thirdparty%2Fldns.git

please lint
---

diff --git a/dnssec_zone.c b/dnssec_zone.c
index 48f9c2ce..3d9558bf 100644
--- a/dnssec_zone.c
+++ b/dnssec_zone.c
@@ -799,8 +799,8 @@ ldns_dnssec_zone_hashed_names_from_nsec3(
 	ldns_rbnode_t* current_node;
 	ldns_dnssec_name* current_name;
 
-	assert(zone);
-	assert(nsec3rr);
+	assert(zone != NULL);
+	assert(nsec3rr != NULL);
 
 	if (zone->hashed_names) {
 		ldns_traverse_postorder(zone->hashed_names,
@@ -832,7 +832,7 @@ ldns_dnssec_name_make_hashed_name(ldns_dnssec_zone *zone,
 {
 	ldns_rbnode_t* new_node;
 
-	assert(name);
+	assert(name != NULL);
 	if (! zone->_nsec3params) {
 		if (! nsec3rr) {
 			return;
diff --git a/examples/ldns-verify-zone.c b/examples/ldns-verify-zone.c
index 09e6fe6f..2937e8df 100644
--- a/examples/ldns-verify-zone.c
+++ b/examples/ldns-verify-zone.c
@@ -250,10 +250,10 @@ verify_next_hashed_name(ldns_dnssec_zone* zone, ldns_dnssec_name *name)
 	char *next_owner_str;
 	ldns_rdf *next_owner_dname;
 
-	assert(name->hashed_name);
+	assert(name->hashed_name != NULL);
 
 	next_node = ldns_rbtree_search(zone->hashed_names, name->hashed_name);
-	assert(next_node);
+	assert(next_node != NULL);
 	do {
 		next_node = ldns_rbtree_next(next_node);
 		if (next_node == LDNS_RBTREE_NULL) {
@@ -664,10 +664,10 @@ void timelog(const char* msg) /* DEBUGING (remove me) */
 
 	if (! msg) {
 		gettimeofday(&start, NULL);
-		dstart = start.tv_sec + ((double)start.tv_usec / 1000000);
+		dstart = (double)start.tv_sec + (start.tv_usec / 1000000.0);
 	} else if (verbosity > 3) {
 		gettimeofday(&now, NULL);
-		dnow = now.tv_sec + ((double)now.tv_usec / 1000000);
+		dnow = (double)now.tv_sec + (now.tv_usec / 1000000.0);
 		fprintf(myout, "%10.6f %s\n", (dnow - dstart), msg);
 	}
 }