From 126b0874f19fa3647c0343d73dfdb48d6154bc08 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 9 Jun 2017 15:18:20 +0200 Subject: [PATCH 1/2] cli: fix output of iface in overview output Fixes: f14845cc200e21ed3aafadc2f9456cb0e2791f56 https://bugzilla.redhat.com/show_bug.cgi?id=1460219 --- clients/cli/general.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/cli/general.c b/clients/cli/general.c index 7fa982fd2d..4179bc9778 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -1197,7 +1197,7 @@ device_overview (NmCli *nmc, NMDevice *device) if ( nm_device_get_ip_iface (device) && g_strcmp0 (nm_device_get_ip_iface (device), nm_device_get_iface (device)) && g_strcmp0 (nm_device_get_ip_iface (device), "")) - g_string_append_printf (outbuf, "%s %s,", _("iface"), nm_device_get_ip_iface (device)); + g_string_append_printf (outbuf, "%s %s, ", _("iface"), nm_device_get_ip_iface (device)); if (nm_device_get_physical_port_id (device)) g_string_append_printf (outbuf, "%s %s, ", _("port"), nm_device_get_physical_port_id (device)); From ee5fdcbfb50ec19b82715440e1c45f3c8e6ee5ea Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 9 Jun 2017 15:23:44 +0200 Subject: [PATCH 2/2] cli: minor refactoring of if-condition in device_overview Note that nm_device_get_ip_iface() never returns an emptry string "". --- clients/cli/general.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clients/cli/general.c b/clients/cli/general.c index 4179bc9778..b8947cf75d 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -1194,9 +1194,9 @@ device_overview (NmCli *nmc, NMDevice *device) else g_string_append_printf (outbuf, "%s, ", _("hw")); - if ( nm_device_get_ip_iface (device) - && g_strcmp0 (nm_device_get_ip_iface (device), nm_device_get_iface (device)) - && g_strcmp0 (nm_device_get_ip_iface (device), "")) + if (!NM_IN_STRSET (nm_device_get_ip_iface (device), + NULL, + nm_device_get_iface (device))) g_string_append_printf (outbuf, "%s %s, ", _("iface"), nm_device_get_ip_iface (device)); if (nm_device_get_physical_port_id (device))