From e42aee89b1542e672fc7af6b496e89d56fecff6b Mon Sep 17 00:00:00 2001 From: Tim Kourt Date: Fri, 19 May 2017 15:13:42 -0700 Subject: [PATCH] client: display table header for the empty lists --- client/device.c | 12 ++++++------ client/known-networks.c | 7 +++---- client/wsc.c | 8 ++++---- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/client/device.c b/client/device.c index 07cfe25f..e7ca3714 100644 --- a/client/device.c +++ b/client/device.c @@ -248,13 +248,13 @@ static void ordered_networks_display(struct l_queue *ordered_networks) const struct l_queue_entry *entry; bool is_first; - if (l_queue_length(ordered_networks)) { - display_table_header("Available networks", - "%s%-*s%-*s%-*s%*s", MARGIN, 2, "", - 32, "Network name", 10, "Security", - 4, "dbms"); - } else { + display_table_header("Available networks", "%s%-*s%-*s%-*s%*s", + MARGIN, 2, "", 32, "Network name", + 10, "Security", 4, "dbms"); + + if (!l_queue_length(ordered_networks)) { display("No networks available\n"); + display_table_footer(); return; } diff --git a/client/known-networks.c b/client/known-networks.c index d7e5e126..aa8a5587 100644 --- a/client/known-networks.c +++ b/client/known-networks.c @@ -78,12 +78,11 @@ static void known_networks_display(struct l_queue *known_networks) { const struct l_queue_entry *entry; - if (l_queue_length(known_networks)) - display_table_header("Known Networks", - " %-*s%-*s%-*s%-*s", + display_table_header("Known Networks", " %-*s%-*s%-*s%-*s", 32, "Name", 11, "Security", 19, "Last connected", 17, "Last seen"); - else + + if (!l_queue_length(known_networks)) display(MARGIN "No known networks\n"); for (entry = l_queue_get_entries(known_networks); entry; diff --git a/client/wsc.c b/client/wsc.c index 1200fbf3..3d1ad223 100644 --- a/client/wsc.c +++ b/client/wsc.c @@ -146,11 +146,11 @@ static enum cmd_status cmd_list(const char *device_name, char *args) proxy_interface_find_all(IWD_WSC_INTERFACE, match_by_device, NULL); - if (match) { - display_table_header("WSC-capable Devices", - MARGIN "%-*s", 20, "Name"); - } else { + display_table_header("WSC-capable Devices", MARGIN "%-*s", 20, "Name"); + + if (!match) { display("No WSC-capable devices available\n"); + display_table_footer(); return CMD_STATUS_OK; }