From 8eefbce9fac4f81644f7f0e32cc0681492739fd7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 26 Mar 2015 12:27:47 +0100 Subject: [PATCH] platform: don't write debug message to stderr Use nm-logging instead. (cherry picked from commit 07f95c371c5a4699270915bb4872f844fa353c86) --- src/platform/nm-linux-platform.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index e6dd6ddaf2..8d002d1bd2 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -1775,10 +1775,6 @@ add_object (NMPlatform *platform, struct nl_object *obj) auto_nl_object struct nl_object *object = obj; NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform); int nle; - struct nl_dump_params dp = { - .dp_type = NL_DUMP_DETAILS, - .dp_fd = stderr, - }; g_return_val_if_fail (object, FALSE); @@ -1794,7 +1790,18 @@ add_object (NMPlatform *platform, struct nl_object *obj) break; default: error ("Netlink error adding %s: %s", to_string_object (platform, object), nl_geterror (nle)); - nl_object_dump (object, &dp); + if (nm_logging_enabled (LOGL_DEBUG, LOGD_PLATFORM)) { + char buf[256]; + struct nl_dump_params dp = { + .dp_type = NL_DUMP_DETAILS, + .dp_buf = buf, + .dp_buflen = sizeof (buf), + }; + + nl_object_dump (object, &dp); + buf[sizeof (buf) - 1] = '\0'; + debug ("netlink object:\n%s", buf); + } return FALSE; }