bugfix 473.

- Fix unnecessary opening and closing of file in read_hex_buffer in drill/work.c.
- Close input_file in read_key_file
- Signed return type of possibly -1 returning read_line

diff --git a/drill/drill_util.c b/drill/drill_util.c
index 8326f13360264eed5fac654f3610952979b6dae9..826870b313315bfc4bb7ad5b9bf16e02d08b4249 100644 (file)
--- a/drill/drill_util.c
+++ b/drill/drill_util.c
@@ -13,7 +13,7 @@
 
 #include <errno.h>
 
-static size_t
+static int
 read_line(FILE *input, char *line, size_t len)
 {
        size_t i;
@@ -71,6 +71,7 @@ read_key_file(const char *filename, ldns_rr_list *key_list)
                }
        }
        printf(";; Number of trusted keys: %d\n", key_count);
+       fclose(input_file);
        if (key_count > 0) {
                return LDNS_STATUS_OK;
        } else {

diff --git a/drill/work.c b/drill/work.c
index 339907b0b72cb734deb48dc00caa26fee346a90f..653145fe522bbb891818f925d837599dad1b52a6 100644 (file)
--- a/drill/work.c
+++ b/drill/work.c
@@ -173,20 +173,7 @@ read_hex_buffer(char *filename)
        size_t wiresize;
        ldns_buffer *result_buffer = NULL;
        
-       FILE *fp = NULL;
-       
-       if (strncmp(filename, "-", 2) != 0) {
-               fp = fopen(filename, "r");
-       } else {
-               fp = stdin;
-       }
-       
-       if (fp == NULL) {
-               perror("");
-               warning("Unable to open %s", filename);
-               return NULL;
-       }
-       
+
        wire = xmalloc(LDNS_MAX_PACKETLEN);
        
        wiresize = packetbuffromfile(filename, wire);
@@ -194,12 +181,8 @@ read_hex_buffer(char *filename)
        result_buffer = LDNS_MALLOC(ldns_buffer);
        ldns_buffer_new_frm_data(result_buffer, wire, wiresize);
        ldns_buffer_set_position(result_buffer, ldns_buffer_capacity(result_buffer));
-       
        xfree(wire);
 
-       if (fp != stdin) {
-               fclose(fp);
-       }
        return result_buffer;
 }
 

diff --git a/ldns/dnssec_zone.h b/ldns/dnssec_zone.h
index 4d2642fd1b45d683a943703da71284c5dee6fca2..70c81b047931be8c545ec01f425c0ea5908df779 100644 (file)
--- a/ldns/dnssec_zone.h
+++ b/ldns/dnssec_zone.h
@@ -8,7 +8,6 @@
 #ifndef LDNS_DNSSEC_ZONE_H
 #define LDNS_DNSSEC_ZONE_H
  
-#include <ldns/ldns.h>
 #include <ldns/rbtree.h>
 #include <ldns/host2str.h>
 

diff --git a/ldns/keys.h b/ldns/keys.h
index 089b55cffad1e074e4093730c5f480ababcf7350..fe6f4c3e1e35ab5a3e66751183b8eccdf2e9f156 100644 (file)
--- a/ldns/keys.h
+++ b/ldns/keys.h
@@ -25,7 +25,6 @@
 #if LDNS_BUILD_CONFIG_HAVE_SSL
 #include <openssl/ssl.h>
 #endif /* LDNS_BUILD_CONFIG_HAVE_SSL */
-#include <ldns/dnssec.h>
 #include <ldns/util.h>
 #include <errno.h>