basic/in-addr-util: add IN_ADDR_TO_STRING

Since we don't need the error value, and the buffer is allocated with a fixed
size, the whole logic provided by in_addr_to_string() becomes unnecessary, so
it's enough to wrap inet_ntop() directly.

inet_ntop() can only fail with ENOSPC. But we specify a buffer that is supposed
to be large enough, so this should never fail. A bunch of tests of this are added.
This allows all the wrappers like strna(), strnull(), strempty() to be dropped.

The guard of 'if (DEBUG_LOGGING)' can be dropped from around log_debug(),
because log_debug() implements the check outside of the function call. But
log_link_debug() does not, so it we need it to avoid unnecessary evaluation of
the formatting.

1 files changed, 1 insertions, 4 deletions

diff --git a/src/test/test-utmp.c b/src/test/test-utmp.c
index 2f66003e65..06a0fce764 100644
--- a/src/test/test-utmp.c
+++ b/src/test/test-utmp.c
@@ -41,10 +41,7 @@ TEST(dump_run_utmp) {
 
                 union in_addr_union addr = {};
                 memcpy(&addr, u->ut_addr_v6, MIN(sizeof(addr), sizeof(u->ut_addr_v6)));
-                _cleanup_free_ char *pretty = NULL;
                 bool is_ipv4 = memeqzero((const uint8_t*) &addr + 4, sizeof(addr) - 4);
-                (void) in_addr_to_string(is_ipv4 ? AF_INET : AF_INET6,
-                                         &addr, &pretty);
 
                 log_info("%14s %10"PID_PRI" line=%-7.*s id=%-4.4s name=%-8.*s session=%lu host=%.*s addr=%s",
                          type,
@@ -54,7 +51,7 @@ TEST(dump_run_utmp) {
                          UT_NAMESIZE, u->ut_user,
                          (long unsigned) u->ut_session,
                          UT_HOSTSIZE, u->ut_host,
-                         strempty(pretty));
+                         IN_ADDR_TO_STRING(is_ipv4 ? AF_INET : AF_INET6, &addr));
         }
 }