From 1111b867ce998bca13bb74471a5533ec4709d099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Fri, 12 Jun 2015 21:46:46 +0200 Subject: [PATCH] utils: fix error logging in ASSERT_VALID_PATH_COMPONENT() (cherry picked from commit 43a50fd5f21018e3e02d7e8e73dae5d2f3e278f5) --- src/NetworkManagerUtils.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index 26ec1b92d7..4f84249443 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -2660,11 +2660,10 @@ ASSERT_VALID_PATH_COMPONENT (const char *name) return name; fail: - if (name) - nm_log_err (LOGD_CORE, "Failed asserting path component: NULL"); - else - nm_log_err (LOGD_CORE, "Failed asserting path component: \"%s\"", name); - g_error ("FATAL: Failed asserting path component: %s", name ? name : "(null)"); + nm_log_err (LOGD_CORE, "Failed asserting path component: %s%s%s", + NM_PRINT_FMT_QUOTED (name, "\"", name, "\"", "(null)")); + g_error ("FATAL: Failed asserting path component: %s%s%s", + NM_PRINT_FMT_QUOTED (name, "\"", name, "\"", "(null)")); g_assert_not_reached (); }