From c84340a9cbf1894f5324c592a436e539dc3f4ebf Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 4 Apr 2023 12:39:58 +0200
Subject: [PATCH] ovsdb: avoid creating JSON string for logging if logging is
 disabled

---
 src/core/devices/ovs/nm-ovsdb.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/core/devices/ovs/nm-ovsdb.c b/src/core/devices/ovs/nm-ovsdb.c
index dc46e20db6..654ab4a44f 100644
--- a/src/core/devices/ovs/nm-ovsdb.c
+++ b/src/core/devices/ovs/nm-ovsdb.c
@@ -279,18 +279,17 @@ static NM_UTILS_LOOKUP_STR_DEFINE(_device_type_to_table,
 static void
 _call_complete(OvsdbMethodCall *call, json_t *response, GError *error)
 {
-    if (response) {
-        gs_free char *str = NULL;
+    gs_free char *str = NULL;
 
-        str = json_dumps(response, 0);
-        if (error)
-            _LOGT_call(call, "completed: %s ; error: %s", str, error->message);
-        else
-            _LOGT_call(call, "completed: %s", str);
-    } else {
-        nm_assert(error);
+    nm_assert(response || error);
+
+    if (response) {
+        _LOGT_call(call,
+                   "completed: %s%s%s",
+                   (str = json_dumps(response, 0)),
+                   NM_PRINT_FMT_QUOTED2(error, " ; error: ", error->message, ""));
+    } else
         _LOGT_call(call, "completed: error: %s", error->message);
-    }
 
     c_list_unlink(&call->calls_lst);