Remove newlines from dighost errors calls

Not all invocations had it, and this makes it more consistent with
dighost_warning. Also remove the conditional newline when not outputting
yaml

(cherry picked from commit 1dd76fe78051b926f2f7b614a40af550c6c6cdf2)

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 33997efa1eab91cf865875dc7a0e1e6d4b61b440..04b3a9ba988239580c89048a80795c535ca54cfc 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -2981,10 +2981,7 @@ dig_error(const char *format, ...) {
        va_start(args, format);
        vprintf(format, args);
        va_end(args);
-
-       if (!yaml) {
-               printf("\n");
-       }
+       printf("\n"); /* We get the error without a newline */
 }
 
 static void

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 9e500de77f47dc5e9f1d6cd9219ab24b2ffc5da8..b5e27931e557ecfc55faee9da4d2477d5edfd1b7 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -3249,7 +3249,7 @@ udp_ready(isc_nmhandle_t *handle, isc_result_t eresult, void *arg) {
                        start_udp(next);
                        check_if_done();
                } else {
-                       dighost_error("no servers could be reached\n");
+                       dighost_error("no servers could be reached");
                        clear_current_lookup();
                }
 
@@ -3432,10 +3432,10 @@ force_next(dig_query_t *query) {
                isc_netaddr_fromsockaddr(&netaddr, &query->sockaddr);
                isc_netaddr_format(&netaddr, buf, sizeof(buf));
 
-               dighost_error("no response from %s\n", buf);
+               dighost_error("no response from %s", buf);
        } else {
                printf("%s", l->cmdline);
-               dighost_error("no servers could be reached\n");
+               dighost_error("no servers could be reached");
        }
 
        if (exitcode < 9) {
@@ -3655,7 +3655,7 @@ tcp_connected(isc_nmhandle_t *handle, isc_result_t eresult, void *arg) {
                        start_tcp(next);
                        check_if_done();
                } else {
-                       dighost_error("no servers could be reached\n");
+                       dighost_error("no servers could be reached");
                        clear_current_lookup();
                }
 
@@ -4109,7 +4109,7 @@ recv_done(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
                         * and cancel the lookup.
                         */
                        printf("%s", l->cmdline);
-                       dighost_error("no servers could be reached\n");
+                       dighost_error("no servers could be reached");
 
                        if (exitcode < 9) {
                                exitcode = 9;