mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Hunt
2019-07-30 08:43:30 -07:00
committed by Ondřej Surý
parent 022649abc3
commit 664b8f04f5
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/dnssec/dnssec-signzone.c
View File

@@ -2651,7 +2651,6 @@ report(const char *format, ...) {
va_start(args, format); va_start(args, format);
vfprintf(out, format, args); vfprintf(out, format, args);
va_end(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). */ /* Unused letters: Bb G J q Yy (and F is reserved). */
#define CMDLINE_FLAGS \ #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. * Process memory debugging argument first.

3
bin/dnssec/dnssec-verify.c
View File

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

4
lib/dns/dnssec.c
View File

@@ -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)); RETERR(make_dnskey(key->key, buf, sizeof(buf), &dnskey));
dst_key_format(key->key, keystr, sizeof(keystr)); 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", keystr, key->ksk ? (allzsk ? "KSK/ZSK" : "KSK") : "ZSK",
key->source == dns_keysource_user ? "file" : "repository"); 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]; char alg[80];
dns_secalg_format(dst_key_alg(key->key), alg, sizeof(alg)); 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); reason, dst_key_id(key->key), alg);
RETERR(make_dnskey(key->key, buf, sizeof(buf), &dnskey)); RETERR(make_dnskey(key->key, buf, sizeof(buf), &dnskey));

4
lib/dns/zoneverify.c
View File

@@ -1939,7 +1939,9 @@ check_bad_algorithms(const vctx_t *vctx, void (*report)(const char *, ...)) {
} }
static void 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]; char algbuf[DNS_SECALG_FORMATSIZE];
int i; int i;