diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-06-09 15:23:44 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-06-09 15:37:29 +0200 |
| commit | c9c0a138294819d1c987d420918fa10d18e9a353 (patch) | |
| tree | 8cb808871de308f0a4cc1e7cb14bcb87441a30df | |
| parent | be4e1000e8c88753e9ca0fee38c15712e5c1dd16 (diff) | |
cli: minor refactoring of if-condition in device_overview
Note that nm_device_get_ip_iface() never returns an emptry string "".
(cherry picked from commit ee5fdcbfb50ec19b82715440e1c45f3c8e6ee5ea)
| -rw-r--r-- | clients/cli/general.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clients/cli/general.c b/clients/cli/general.c index 4406c849c3..68fab6e049 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -1136,9 +1136,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)) |