move define to be able to use it in the unit test

switched test result output of zone reader
fixed type for LOC altitude

diff --git a/host2str.c b/host2str.c
index ef551375ed5cf4b804ea56ec5dd8055e21275181..d041cb88a3de98bb2b7083c8eef5db89c9113736 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -352,7 +352,7 @@ ldns_rdf2buffer_str_loc(ldns_buffer *output, const ldns_rdf *rdf)
        uint8_t vertical_precision;
        uint32_t longitude;
        uint32_t latitude;
-       uint32_t altitude;
+       long altitude;
        char northerness;
        char easterness;
        uint32_t h;

diff --git a/ldns/rr.h b/ldns/rr.h
index 819e171a345847d84fb2b9d929ecece276c29d21..25f8481584743589e273b7e62c19c742a4354ad3 100644 (file)
--- a/ldns/rr.h
+++ b/ldns/rr.h
@@ -32,6 +32,10 @@
 /** The bytes TTL, CLASS and length use up in an rr */
 #define LDNS_RR_OVERHEAD       10
 
+/* The first 48 fields are 'common' and can be referenced instantly */
+#define LDNS_RDATA_FIELD_DESCRIPTORS_COMMON 48
+
+
 
 /**
  *  The different RR classes.

diff --git a/rr.c b/rr.c
index 691f7715c5321165df0087c5188493d89ffcae3b..0192c920de32e4ad65b1e021e9ef47347d9d5375 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -2019,9 +2019,6 @@ static ldns_rr_descriptor rdata_field_descriptors[] = {
 #define LDNS_RDATA_FIELD_DESCRIPTORS_COUNT \
        (sizeof(rdata_field_descriptors)/sizeof(rdata_field_descriptors[0]))
 
-/* The first 48 fields are 'common' and can be referenced instantly */
-#define LDNS_RDATA_FIELD_DESCRIPTORS_COMMON 48
-
 const ldns_rr_descriptor *
 ldns_rr_descript(uint16_t type)
 {

diff --git a/test/08-zonereader.tpkg b/test/08-zonereader.tpkg
index ab98e8b51668f65c1296c4e7e7234303a918a200..6bae9e4a46ee6ff6530674d3717e6a21bea753ff 100644 (file)
Binary files a/test/08-zonereader.tpkg and b/test/08-zonereader.tpkg differ

diff --git a/test/19.unit-tests-rrtypes.tpkg b/test/19.unit-tests-rrtypes.tpkg
index 085e4a6a945fa024869453e09f9de979d8cdb1b7..edd782748312511fd91bf29f0f9f7de09e09d3bf 100644 (file)
Binary files a/test/19.unit-tests-rrtypes.tpkg and b/test/19.unit-tests-rrtypes.tpkg differ