summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2015-06-12 21:46:46 +0200
committerJiří Klimeš <jklimes@redhat.com>2015-07-08 16:50:28 +0200
commit43a50fd5f21018e3e02d7e8e73dae5d2f3e278f5 (patch)
treed643009d65f4a07da240e3811f2cccdcf6fa476d
parent46f29a4abceafa86c1d0a579cef21b928ba96a48 (diff)
downloadNetworkManager-43a50fd5f21018e3e02d7e8e73dae5d2f3e278f5.tar.gz
utils: fix error logging in ASSERT_VALID_PATH_COMPONENT()
-rw-r--r--src/NetworkManagerUtils.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
index 4ca8bc89b6..a9c72433ad 100644
--- a/src/NetworkManagerUtils.c
+++ b/src/NetworkManagerUtils.c
@@ -2697,11 +2697,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 ();
}