From 66b3cb9732c236fe0677a8f957fa4e072f1e1fd6 Mon Sep 17 00:00:00 2001 From: Tony Finch Date: Tue, 5 Apr 2022 13:16:00 +0100 Subject: [PATCH] Remove several superfluous newlines in log messages --- lib/dns/adb.c | 8 ++++---- lib/isc/netmgr/netmgr-int.h | 8 ++++---- lib/ns/query.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/dns/adb.c b/lib/dns/adb.c index 4a769f36351..09862194253 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -881,7 +881,7 @@ link_entry(dns_adbentrybucket_t *ebucket, dns_adbentry_t *entry) { REQUIRE(entry != NULL && entry->bucket == NULL); REQUIRE(!ISC_LINK_LINKED(entry, plink)); - DP(DEF_LEVEL, "link ADB entry %p to bucket %p\n", entry, ebucket); + DP(DEF_LEVEL, "link ADB entry %p to bucket %p", entry, ebucket); /* * If we're in the overmem condition, take this opportunity to @@ -937,7 +937,7 @@ unlink_entry(dns_adbentry_t *entry) { REQUIRE(ebucket != NULL); - DP(DEF_LEVEL, "unlink ADB entry %p from bucket %p\n", entry, ebucket); + DP(DEF_LEVEL, "unlink ADB entry %p from bucket %p", entry, ebucket); if ((entry->flags & ENTRY_IS_DEAD) != 0) { ISC_LIST_UNLINK(ebucket->deadentries, entry, plink); @@ -2041,7 +2041,7 @@ destroy(dns_adb_t *adb) { isc_result_t result; isc_ht_iter_t *it = NULL; - DP(DEF_LEVEL, "destroying ADB %p\n", adb); + DP(DEF_LEVEL, "destroying ADB %p", adb); adb->magic = 0; @@ -2248,7 +2248,7 @@ dns_adb_shutdown(dns_adb_t *adb) { return; } - DP(DEF_LEVEL, "shutting down ADB %p\n", adb); + DP(DEF_LEVEL, "shutting down ADB %p", adb); isc_mem_clearwater(adb->mctx); diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h index eb4b14e368f..10c56514af5 100644 --- a/lib/isc/netmgr/netmgr-int.h +++ b/lib/isc/netmgr/netmgr-int.h @@ -2155,8 +2155,8 @@ isc__nmsocket_readtimeout_cb(uv_timer_t *timer); void isc__nmsocket_writetimeout_cb(void *data, isc_result_t eresult); -#define UV_RUNTIME_CHECK(func, ret) \ - if (ret != 0) { \ - isc_error_fatal(__FILE__, __LINE__, "%s failed: %s\n", #func, \ - uv_strerror(ret)); \ +#define UV_RUNTIME_CHECK(func, ret) \ + if (ret != 0) { \ + isc_error_fatal(__FILE__, __LINE__, "%s failed: %s", #func, \ + uv_strerror(ret)); \ } diff --git a/lib/ns/query.c b/lib/ns/query.c index d18bf7e22e2..12905bf2433 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -7005,7 +7005,7 @@ query_checkrrl(query_ctx_t *qctx, isc_result_t result) { ISC_LOG_DEBUG(99), "rrl=%p, HAVECOOKIE=%u, result=%s, " "fname=%p(%u), is_zone=%u, RECURSIONOK=%u, " - "query.rpz_st=%p(%u), RRL_CHECKED=%u\n", + "query.rpz_st=%p(%u), RRL_CHECKED=%u", qctx->client->view->rrl, HAVECOOKIE(qctx->client), isc_result_toid(result), qctx->fname, qctx->fname != NULL ? dns_name_isabsolute(qctx->fname) : 0, -- 2.47.3