From ad659de3bad2c3c154c6c8532a8bcd33e6035622 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 16 Jan 2023 08:12:33 +0100 Subject: [PATCH] platform: remove log_result from do_change_link() It conveys no useful information beyond what wait_for_nl_response_to_string() returns. --- src/libnm-platform/nm-linux-platform.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/libnm-platform/nm-linux-platform.c b/src/libnm-platform/nm-linux-platform.c index 5e29880cb1..e608104ce0 100644 --- a/src/libnm-platform/nm-linux-platform.c +++ b/src/libnm-platform/nm-linux-platform.c @@ -8157,7 +8157,6 @@ do_change_link(NMPlatform *platform, char s_buf[256]; int result = 0; NMLogLevel log_level = LOGL_DEBUG; - const char *log_result = "failure"; const char *log_detail = ""; gs_free char *log_detail_free = NULL; const NMPObject *obj_cache; @@ -8191,9 +8190,7 @@ retry: goto retry; } - if (seq_result == WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_OK) { - log_result = "success"; - } else if (NM_IN_SET(seq_result, -EEXIST, -EADDRINUSE)) { + if (NM_IN_SET(seq_result, WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_OK, -EEXIST, -EADDRINUSE)) { /* */ } else if (NM_IN_SET(seq_result, -ESRCH, -ENOENT)) { log_detail = ", firmware not found"; @@ -8210,7 +8207,6 @@ retry: == 0) { /* work around ENFILE which may be wrongly returned (bgo #770456). * If the MAC address is as expected, assume success? */ - log_result = "success"; log_detail = " (assume success changing address)"; result = 0; } else if (NM_IN_SET(seq_result, -ENODEV)) { @@ -8226,9 +8222,8 @@ retry: out: _NMLOG(log_level, - "do-change-link[%d]: %s changing link: %s%s", + "do-change-link[%d]: %s%s", ifindex, - log_result, wait_for_nl_response_to_string(seq_result, errmsg, s_buf, sizeof(s_buf)), log_detail); return result;