lint thingies

diff --git a/host2str.c b/host2str.c
index 6d39737e383ab13913c95acf25ac254ab1678dc3..65cc91000d948a7fc8fd848eb4d9b88a58ab29fe 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -502,7 +502,7 @@ ldns_rdf2buffer_str_apl(ldns_buffer *output, ldns_rdf *rdf)
        /* todo: use #defines for address families? */
        
        /* ipv4 */
-       while (pos < ldns_rdf_size(rdf)) {
+       while (pos < (unsigned int) ldns_rdf_size(rdf)) {
                address_family = read_uint16(&data[pos]);
                prefix = data[pos + 2];
                negation = data[pos + 3] & 0x80;
@@ -518,7 +518,7 @@ ldns_rdf2buffer_str_apl(ldns_buffer *output, ldns_rdf *rdf)
                                if (i > 0) {
                                        ldns_buffer_printf(output, ".");
                                }
-                               if (i < adf_length) {
+                               if (i < (unsigned short) adf_length) {
                                        ldns_buffer_printf(output, "%d", 
                                                           data[pos + i + 4]);
                                } else {
@@ -537,7 +537,7 @@ ldns_rdf2buffer_str_apl(ldns_buffer *output, ldns_rdf *rdf)
                                if (i % 2 == 0 && i > 0) {
                                        ldns_buffer_printf(output, ":");
                                }
-                               if (i < adf_length) {
+                               if (i < (unsigned short) adf_length) {
                                        ldns_buffer_printf(output, "%02x", 
                                                           data[pos + i + 4]);
                                } else {
@@ -549,7 +549,7 @@ ldns_rdf2buffer_str_apl(ldns_buffer *output, ldns_rdf *rdf)
                } else {
                        /* unknown address family */
                        ldns_buffer_printf(output, "Unknown address family: %u data: ", address_family);
-                       for (i = 1; i < 4 + adf_length; i++) {
+                       for (i = 1; i < (unsigned short) (4 + adf_length); i++) {
                                ldns_buffer_printf(output, "%02x", data[i]);
                        }
                }

diff --git a/host2wire.c b/host2wire.c
index 615a6026997c9e6851dbb328bc435237a6200be3..e6a3778eb4665e826f05286218a07b6a8594db5f 100644 (file)
--- a/host2wire.c
+++ b/host2wire.c
@@ -54,12 +54,12 @@ ldns_rr2buffer_wire(ldns_buffer *buffer, ldns_rr *rr, int section)
        uint16_t rdl_pos = 0;
        
        if (ldns_rr_owner(rr)) {
-               ldns_dname2buffer_wire(buffer, ldns_rr_owner(rr));
+               (void) ldns_dname2buffer_wire(buffer, ldns_rr_owner(rr));
        }
        
        if (ldns_buffer_reserve(buffer, 4)) {
-               ldns_buffer_write_u16(buffer, ldns_rr_get_type(rr));
-               ldns_buffer_write_u16(buffer, ldns_rr_get_class(rr));
+               (void) ldns_buffer_write_u16(buffer, ldns_rr_get_type(rr));
+               (void) ldns_buffer_write_u16(buffer, ldns_rr_get_class(rr));
        }
 
        if (section != LDNS_SECTION_QUESTION) {
@@ -71,7 +71,7 @@ ldns_rr2buffer_wire(ldns_buffer *buffer, ldns_rr *rr, int section)
                }       
 
                for (i = 0; i < ldns_rr_rd_count(rr); i++) {
-                       ldns_rdf2buffer_wire(buffer, ldns_rr_rdf(rr, i));
+                       (void) ldns_rdf2buffer_wire(buffer, ldns_rr_rdf(rr, i));
                }
                
                if (rdl_pos != 0) {
@@ -127,12 +127,12 @@ ldns_pkt2buffer_wire(ldns_buffer *buffer, ldns_pkt *packet)
        ldns_rr_list *rr_list;
        uint16_t i;
        
-       ldns_hdr2buffer_wire(buffer, packet);
+       (void) ldns_hdr2buffer_wire(buffer, packet);
 
        rr_list = ldns_pkt_question(packet);
        if (rr_list) {
                for (i = 0; i < ldns_rr_list_rr_count(rr_list); i++) {
-                       ldns_rr2buffer_wire(buffer, 
+                       (void) ldns_rr2buffer_wire(buffer, 
                                     ldns_rr_list_rr(rr_list, i), 
                                     LDNS_SECTION_QUESTION);
                }
@@ -140,7 +140,7 @@ ldns_pkt2buffer_wire(ldns_buffer *buffer, ldns_pkt *packet)
        rr_list = ldns_pkt_answer(packet);
        if (rr_list) {
                for (i = 0; i < ldns_rr_list_rr_count(rr_list); i++) {
-                       ldns_rr2buffer_wire(buffer, 
+                       (void) ldns_rr2buffer_wire(buffer, 
                                     ldns_rr_list_rr(rr_list, i), 
                                     LDNS_SECTION_ANSWER);
                }
@@ -148,7 +148,7 @@ ldns_pkt2buffer_wire(ldns_buffer *buffer, ldns_pkt *packet)
        rr_list = ldns_pkt_authority(packet);
        if (rr_list) {
                for (i = 0; i < ldns_rr_list_rr_count(rr_list); i++) {
-                       ldns_rr2buffer_wire(buffer, 
+                       (void) ldns_rr2buffer_wire(buffer, 
                                     ldns_rr_list_rr(rr_list, i), 
                                     LDNS_SECTION_AUTHORITY);
                }
@@ -156,7 +156,7 @@ ldns_pkt2buffer_wire(ldns_buffer *buffer, ldns_pkt *packet)
        rr_list = ldns_pkt_additional(packet);
        if (rr_list) {
                for (i = 0; i < ldns_rr_list_rr_count(rr_list); i++) {
-                       ldns_rr2buffer_wire(buffer, 
+                       (void) ldns_rr2buffer_wire(buffer, 
                                     ldns_rr_list_rr(rr_list, i), 
                                     LDNS_SECTION_ADDITIONAL);
                }

diff --git a/packet.c b/packet.c
index bca7a5ca17364b255510a45993e9bc788734b6dd..8a370d5549c691cea9a6420e7dbd71b08009fe66 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -382,7 +382,6 @@ ldns_pkt_query_new(ldns_rdf *rr_name, ldns_rr_type rr_type, ldns_rr_class rr_cla
 {
        ldns_pkt *packet;
        ldns_rr *question_rr;
-       ldns_rdf *name_rdf;
 
        packet = ldns_pkt_new();
        if (!packet) {

diff --git a/run-test1.c b/run-test1.c
index 160e58cf29040f0283cd3fa6237e23dcd04f35a2..578b7b69c79265c5d6b8f304d1374f534ae5558a 100644 (file)
--- a/run-test1.c
+++ b/run-test1.c
@@ -40,7 +40,7 @@ doit(void)
        }
 
        printf("Setting 15242\n");
-       if (ldns_str2rdf_int16(&rdata, "15242") != LDNS_STATUS_OK) {
+       if (ldns_str2rdf_int16(&rdata, (uint8_t *) "15242") != LDNS_STATUS_OK) {
                printf("_short: ah man, shit hit the fan\n");
        }
        
@@ -53,11 +53,11 @@ int
 main(void)
 {
        ldns_rdf *bla;
-       if (ldns_str2rdf_int16(&bla, "15242") != LDNS_STATUS_OK) {
+       if (ldns_str2rdf_int16(&bla, (uint8_t *) "15242") != LDNS_STATUS_OK) {
                printf("_int16: ah man, shit hit the fan\n");
        }
        /* %Y%m%d%H%M%S */
-       if (ldns_str2rdf_time(&bla, "20041222134100") != LDNS_STATUS_OK) {
+       if (ldns_str2rdf_time(&bla, (uint8_t *) "20041222134100") != LDNS_STATUS_OK) {
                printf("_time: ah man, shit hit the fan\n");
        }
 

diff --git a/run-test2.c b/run-test2.c
index adb1260da5c93daded3105b0a45173f3dea87a80..e3b6577f1e9e8277ae25ea0642b118b85447dd87 100644 (file)
--- a/run-test2.c
+++ b/run-test2.c
@@ -205,10 +205,10 @@ main(int argc, char **argv)
        /*buffer = ldns_buffer_new(65535);*/
        target_buf = ldns_pkt2wire(pkt, &len);
 
-       printf("Buffer length: %u\n", len);
+       printf("Buffer length: %u\n", (unsigned int) len);
        
        for (i=0; i<len; i++) {
-               printf("%02x", target_buf[i]);
+               printf("%02x", (unsigned int) target_buf[i]);
        }
        printf("\n\n");
 

diff --git a/run-test3.c b/run-test3.c
index 9f20ed0acf42a64fb317e6cc82296641ddf0050d..37e70af4bcdca2ac2c9d4b3d9848d7c13c2948e3 100644 (file)
--- a/run-test3.c
+++ b/run-test3.c
@@ -17,13 +17,13 @@ main(void)
        ldns_rdf *rd;
 
        fprintf(stdout, "www.\n");
-       ldns_str2rdf_dname(&rd, "www.");
+       (void) ldns_str2rdf_dname(&rd, (uint8_t *) "www.");
        fprintf(stdout, "www.miek.nl\n");
-       ldns_str2rdf_dname(&rd, "www.miek.nl");
+       (void) ldns_str2rdf_dname(&rd, (uint8_t *) "www.miek.nl");
        fprintf(stdout, "www\n");
-       ldns_str2rdf_dname(&rd, "www");
+       (void) ldns_str2rdf_dname(&rd, (uint8_t *) "www");
        fprintf(stdout, "www.miek.nl..\n");
-       ldns_str2rdf_dname(&rd, "www.miek.nl..");
+       (void) ldns_str2rdf_dname(&rd, (uint8_t *) "www.miek.nl..");
 
        return 0;
 }