From: Wouter Wijngaards <wouter@NLnetLabs.nl>
Date: Fri, 20 Jan 2012 10:18:41 +0000 (+0000)
Subject: fix compile warnings on OpenIndiana (sunOS 5.11).
X-Git-Tag: release-1.6.13rc1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e5a4b6acf877894c5d80ba5eb2e27cfe4955311;p=thirdparty%2Fldns.git

fix compile warnings on OpenIndiana (sunOS 5.11).
---

diff --git a/drill/chasetrace.c b/drill/chasetrace.c
index a1dfd446..77dbf319 100644
--- a/drill/chasetrace.c
+++ b/drill/chasetrace.c
@@ -229,7 +229,7 @@ do_chase(ldns_resolver *res,
 	    ldns_rr_list *trusted_keys,
 	    ldns_pkt *pkt_o,
 	    uint16_t qflags,
-	    ldns_rr_list *prev_key_list,
+	    ldns_rr_list * ATTR_UNUSED(prev_key_list),
 	    int verbosity)
 {
 	ldns_rr_list *rrset = NULL;
diff --git a/drill/drill.c b/drill/drill.c
index 9077cd69..2f779634 100644
--- a/drill/drill.c
+++ b/drill/drill.c
@@ -97,7 +97,7 @@ main(int argc, char *argv[])
         ldns_pkt	*pkt;
         ldns_pkt	*qpkt;
         char 		*serv;
-        char 		*name;
+        const char 	*name;
         char 		*name2;
 	char		*progname;
 	char 		*query_file = NULL;
diff --git a/drill/drill_util.c b/drill/drill_util.c
index 596be9d5..057ea670 100644
--- a/drill/drill_util.c
+++ b/drill/drill_util.c
@@ -240,7 +240,7 @@ print_dnskey_abbr(FILE *fp, ldns_rr *key)
 }
 
 void
-print_rr_list_abbr(FILE *fp, ldns_rr_list *rrlist, char *usr) 
+print_rr_list_abbr(FILE *fp, ldns_rr_list *rrlist, const char *usr) 
 {
 	size_t i;
 	ldns_rr_type tp;
diff --git a/drill/drill_util.h b/drill/drill_util.h
index db3a5743..de784411 100644
--- a/drill/drill_util.h
+++ b/drill/drill_util.h
@@ -39,7 +39,7 @@ void print_ds_abbr(FILE *fp, ldns_rr *ds);
 /**
  * print some rdfs of a rr in a rr_list
  */
-void print_rr_list_abbr(FILE *fp, ldns_rr_list *sig, char *usr);
+void print_rr_list_abbr(FILE *fp, ldns_rr_list *sig, const char *usr);
 
 /**
  * Alloc some memory, with error checking
diff --git a/examples/ldns-compare-zones.c b/examples/ldns-compare-zones.c
index 56d36a28..07c0c6ca 100644
--- a/examples/ldns-compare-zones.c
+++ b/examples/ldns-compare-zones.c
@@ -23,7 +23,7 @@
 #define OP_CHG '~'
 
 static void 
-usage(int argc, char **argv)
+usage(int ATTR_UNUSED(argc), char **argv)
 {
 	printf("Usage: %s [-v] [-i] [-d] [-c] [-s] <zonefile1> <zonefile2>\n",
 		  argv[0]);
diff --git a/examples/ldns-gen-zone.c b/examples/ldns-gen-zone.c
index 637f0026..cf5e5fd8 100644
--- a/examples/ldns-gen-zone.c
+++ b/examples/ldns-gen-zone.c
@@ -78,8 +78,8 @@ insert_ds(ldns_rdf *dsowner, uint32_t ttl)
 int
 main(int argc, char **argv) {
         char *filename, *rrstr, *ownerstr;
-        char *classtypestr1 = "IN NS ns1.example.com.";
-        char *classtypestr2 = "IN NS ns2.example.com.";
+        const char *classtypestr1 = "IN NS ns1.example.com.";
+        const char *classtypestr2 = "IN NS ns2.example.com.";
         const size_t classtypelen = strlen(classtypestr1);
         /* Simply because this was developed by SIDN and we don't use xn-- for .nl :-) */
         const char *punystr = "xn--fake-rr";
diff --git a/examples/ldns-notify.c b/examples/ldns-notify.c
index fb8015df..018a716f 100644
--- a/examples/ldns-notify.c
+++ b/examples/ldns-notify.c
@@ -181,7 +181,7 @@ main(int argc, char **argv)
 	int do_hexdump = 1;
 	uint8_t *wire = NULL;
 	size_t wiresize = 0;
-	char *port = "53";
+	const char *port = "53";
 
 	srandom(time(NULL) ^ getpid());
 
@@ -201,7 +201,7 @@ main(int argc, char **argv)
 			soa_version = (uint32_t)atoi(optarg);
 			break;
                 case 'y':
-			tsig_cred.algorithm = "hmac-md5.sig-alg.reg.int.";
+			tsig_cred.algorithm = (char*)"hmac-md5.sig-alg.reg.int.";
 			tsig_cred.keyname = optarg;
 			tsig_cred.keydata = strchr(optarg, ':');
 			*tsig_cred.keydata = '\0';
diff --git a/examples/ldns-rrsig.c b/examples/ldns-rrsig.c
index e52556b3..a6658616 100644
--- a/examples/ldns-rrsig.c
+++ b/examples/ldns-rrsig.c
@@ -33,7 +33,7 @@ main(int argc, char *argv[])
 	ldns_rr_list *ns_ip;
 	uint8_t i, j;
 	ldns_rr_type t;
-	char * type_name;
+	const char * type_name;
 	struct tm incep, expir;
 	char incep_buf[26];
 	char expir_buf[26];
diff --git a/examples/ldns-signzone.c b/examples/ldns-signzone.c
index 7f0813ca..ad6a3c9f 100644
--- a/examples/ldns-signzone.c
+++ b/examples/ldns-signzone.c
@@ -61,7 +61,7 @@ usage(FILE *fp, const char *prog) {
 }
 
 void
-usage_openssl(FILE *fp, const char *prog) {
+usage_openssl(FILE *fp, const char* ATTR_UNUSED(prog)) {
 	fprintf(fp, "Special commands for openssl engines:\n");
 	fprintf(fp, "-c <file>\tOpenSSL config file\n");
 }
@@ -169,7 +169,8 @@ find_key_in_zone(ldns_rr *pubkey_gen, ldns_zone *zone) {
 }
 
 static ldns_rr *
-find_key_in_file(const char *keyfile_name_base, ldns_key *key, uint32_t zone_ttl)
+find_key_in_file(const char *keyfile_name_base, ldns_key* ATTR_UNUSED(key),
+	uint32_t zone_ttl)
 {
 	char *keyfile_name;
 	FILE *keyfile;
diff --git a/examples/ldns-test-edns.c b/examples/ldns-test-edns.c
index 10958085..d9d708c7 100644
--- a/examples/ldns-test-edns.c
+++ b/examples/ldns-test-edns.c
@@ -46,7 +46,7 @@ convert_addr(char* str, int p, struct sockaddr_storage* addr, socklen_t* len)
 
 /** create a query to test */
 static ldns_buffer*
-make_query(char* nm, int tp)
+make_query(const char* nm, int tp)
 {
 	/* with EDNS DO and CDFLAG */
 	ldns_buffer* b = ldns_buffer_new(512);
@@ -86,8 +86,8 @@ make_query(char* nm, int tp)
 
 /** try 3 times to get an EDNS reply from the server, exponential backoff */
 static int
-get_packet(struct sockaddr_storage* addr, socklen_t len, char* nm, int tp,
-	uint8_t **wire, size_t* wlen)
+get_packet(struct sockaddr_storage* addr, socklen_t len, const char* nm,
+	int tp, uint8_t **wire, size_t* wlen)
 {
 	struct timeval t;
 	ldns_buffer* qbin;
diff --git a/examples/ldns-testns.c b/examples/ldns-testns.c
index 5b2f9232..5dc06a29 100644
--- a/examples/ldns-testns.c
+++ b/examples/ldns-testns.c
@@ -188,7 +188,7 @@ static void error(const char* msg, ...)
 	exit(EXIT_FAILURE);
 }
 
-void verbose(int lvl, const char* msg, ...)
+void verbose(int ATTR_UNUSED(lvl), const char* msg, ...)
 {
 	va_list args;
 	va_start(args, msg);
diff --git a/examples/ldns-verify-zone.c b/examples/ldns-verify-zone.c
index 709ac707..7b67c73b 100644
--- a/examples/ldns-verify-zone.c
+++ b/examples/ldns-verify-zone.c
@@ -464,7 +464,7 @@ verify_nsec(
 
 static ldns_status
 verify_dnssec_name(ldns_rdf *zone_name,
-		ldns_dnssec_zone *zone,
+		ldns_dnssec_zone* ATTR_UNUSED(zone),
                 ldns_rbtree_t *zone_nodes,
                 ldns_rbnode_t *cur_node,
 		ldns_rr_list *keys,