add -q to getopt flags, and use newlines consistently with report()

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 8b5e4c34a5a97666aeea48f140b27abc3417dbe4..8fc7080a46ea2eec4c5dee7a7fd870878e804c6b 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -2651,7 +2651,6 @@ report(const char *format, ...) {
                va_start(args, format);
                vfprintf(out, format, args);
                va_end(args);
-               putc('\n', out);
        }
 }
 
@@ -3221,7 +3220,7 @@ main(int argc, char *argv[]) {
 
        /* Unused letters: Bb G J q Yy (and F is reserved). */
 #define CMDLINE_FLAGS \
-       "3:AaCc:Dd:E:e:f:FghH:i:I:j:K:k:L:l:m:M:n:N:o:O:PpQRr:s:ST:tuUv:VX:xzZ:"
+       "3:AaCc:Dd:E:e:f:FghH:i:I:j:K:k:L:l:m:M:n:N:o:O:PpQqRr:s:ST:tuUv:VX:xzZ:"
 
        /*
         * Process memory debugging argument first.

diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c
index 7fff0df94ec734d96948f249091408e32aaa10ac..420bf979b8799681f770085e308958f91448a1af 100644 (file)
--- a/bin/dnssec/dnssec-verify.c
+++ b/bin/dnssec/dnssec-verify.c
@@ -85,7 +85,6 @@ report(const char *format, ...) {
                va_start(args, format);
                vfprintf(stdout, format, args);
                va_end(args);
-               putc('\n', stdout);
        }
 }
 
@@ -184,7 +183,7 @@ main(int argc, char *argv[]) {
        int ch;
 
 #define CMDLINE_FLAGS \
-       "hm:o:I:c:E:v:Vxz"
+       "c:E:hm:o:I:qv:Vxz"
 
        /*
         * Process memory debugging argument first.

diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index b99803489da42752d57e72bd2613ef9cf5664af8..800271956ce5051fb3fccc886a5997087179df8b 100644 (file)
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -1813,7 +1813,7 @@ publish_key(dns_diff_t *diff, dns_dnsseckey_t *key, const dns_name_t *origin,
        RETERR(make_dnskey(key->key, buf, sizeof(buf), &dnskey));
        dst_key_format(key->key, keystr, sizeof(keystr));
 
-       report("Fetching %s (%s) from key %s.",
+       report("Fetching %s (%s) from key %s.\n",
               keystr, key->ksk ? (allzsk ? "KSK/ZSK" : "KSK") : "ZSK",
               key->source == dns_keysource_user ?  "file" : "repository");
 
@@ -1849,7 +1849,7 @@ remove_key(dns_diff_t *diff, dns_dnsseckey_t *key, const dns_name_t *origin,
        char alg[80];
 
        dns_secalg_format(dst_key_alg(key->key), alg, sizeof(alg));
-       report("Removing %s key %d/%s from DNSKEY RRset.",
+       report("Removing %s key %d/%s from DNSKEY RRset.\n",
               reason, dst_key_id(key->key), alg);
 
        RETERR(make_dnskey(key->key, buf, sizeof(buf), &dnskey));

diff --git a/lib/dns/zoneverify.c b/lib/dns/zoneverify.c
index 3d75efb7ceacacaa38a6c65bd4105d34ccb1b2f4..eb5aedc196bef2d488d30436efe2418903b5adef 100644 (file)
--- a/lib/dns/zoneverify.c
+++ b/lib/dns/zoneverify.c
@@ -1939,7 +1939,9 @@ check_bad_algorithms(const vctx_t *vctx, void (*report)(const char *, ...)) {
 }
 
 static void
-print_summary(const vctx_t *vctx, bool keyset_kskonly, void (*report)(const char *, ...)) {
+print_summary(const vctx_t *vctx, bool keyset_kskonly,
+             void (*report)(const char *, ...))
+{
        char algbuf[DNS_SECALG_FORMATSIZE];
        int i;