Issue #38 Unclear error message from ldns-read-zone

diff --git a/Changelog b/Changelog
index 7d9eed30ab14a49dbe32dde7a721ecbe7dd80c60..a557b103991e587a3420891e8177f8574df59676 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,7 @@
 1.7.2  2019-??-??
-       * bufix: Revert unused variables in ldns-config removal patch.
+       * bugfix #38: Print "line" before line number when printing
+         zone parse errors. Thanks Petr Špaček.
+       * bugfix: Revert unused variables in ldns-config removal patch.
        * bugfix #50: heap Out-of-bound Read vulnerability in
          rr_frm_str_internal reported by pokerfacett.
        * bugfix #51: Heap Out-of-bound Read vulnerability in

diff --git a/examples/ldns-compare-zones.c b/examples/ldns-compare-zones.c
index 3cba5444d17c8dae7ba768b9ac80a30818630ab6..b156ac2ec6d4100f3e4f9b480923f051319601ba 100644 (file)
--- a/examples/ldns-compare-zones.c
+++ b/examples/ldns-compare-zones.c
@@ -133,7 +133,7 @@ main(int argc, char **argv)
                                                  LDNS_RR_CLASS_IN, &line_nr1);
        if (s != LDNS_STATUS_OK) {
                fclose(fp1);
-               fprintf(stderr, "%s: %s at %d\n",
+               fprintf(stderr, "%s: %s at line %d\n",
                           fn1,
                           ldns_get_errorstr_by_id(s),
                           line_nr1);
@@ -153,7 +153,7 @@ main(int argc, char **argv)
        if (s != LDNS_STATUS_OK) {
                ldns_zone_deep_free(z1);
                fclose(fp2);
-               fprintf(stderr, "%s: %s at %d\n",
+               fprintf(stderr, "%s: %s at line %d\n",
                           fn2,
                           ldns_get_errorstr_by_id(s),
                           line_nr2);

diff --git a/examples/ldns-gen-zone.c b/examples/ldns-gen-zone.c
index 011633704875ac3aef92c26618b1746fcf49e464..9050f67bf44f76dd81434862c77ba9ae9157b5c8 100644 (file)
--- a/examples/ldns-gen-zone.c
+++ b/examples/ldns-gen-zone.c
@@ -169,7 +169,7 @@ main(int argc, char **argv) {
         }
         s = ldns_zone_new_frm_fp_l(&z, fp, origin, 0, LDNS_RR_CLASS_IN, &line_nr);
         if (s != LDNS_STATUS_OK) {
-                fprintf(stderr, "%s at %d\n", ldns_get_errorstr_by_id(s), line_nr);
+                fprintf(stderr, "%s at line %d\n", ldns_get_errorstr_by_id(s), line_nr);
                 exit(EXIT_FAILURE);
         }
         if (!ldns_zone_soa(z)) {

diff --git a/examples/ldns-read-zone.c b/examples/ldns-read-zone.c
index c61f80ad80b4cd2c09d46153f9ae0ebdbde240a7..2a1bc99a32cb0df90bf855c72acfbf8eadae7fe5 100644 (file)
--- a/examples/ldns-read-zone.c
+++ b/examples/ldns-read-zone.c
@@ -258,7 +258,7 @@ main(int argc, char **argv)
 
        fclose(fp);
        if (s != LDNS_STATUS_OK) {
-               fprintf(stderr, "%s at %d\n", 
+               fprintf(stderr, "%s at line %d\n", 
                                ldns_get_errorstr_by_id(s),
                                line_nr);
                 exit(EXIT_FAILURE);

diff --git a/examples/ldns-verify-zone.c b/examples/ldns-verify-zone.c
index 4742c4dfe3c24b16d8c8b00b14e640815c29e1d3..c17bd21cdf25566fc02eae867efd740e0265f51b 100644 (file)
--- a/examples/ldns-verify-zone.c
+++ b/examples/ldns-verify-zone.c
@@ -935,7 +935,7 @@ main(int argc, char **argv)
                ldns_dnssec_zone_deep_free(dnssec_zone);
        } else {
                if (verbosity > 0) {
-                       fprintf(myerr, "%s at %d\n",
+                       fprintf(myerr, "%s at line %d\n",
                                ldns_get_errorstr_by_id(s), line_nr);
                }
                 exit(EXIT_FAILURE);