[systemd-commits] src/network

[Lennart Poettering]

 src/network/networkctl.c |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit e92da1e5d0a3b38804e173af136ec7a076c7757e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Aug 14 01:23:20 2014 +0200

    networkctl: also use the same color logic when running "networkctl status" without arguments

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index dc0bb4d..8e02188 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -439,19 +439,13 @@ static int link_status(char **args, unsigned n) {
                 _cleanup_free_ char *operational_state = NULL;
                 _cleanup_strv_free_ char **dns = NULL, **ntp = NULL;
                 _cleanup_free_ struct local_address *addresses = NULL;
-                const char *on_color_oper = "", *off_color_oper = "";
+                const char *on_color_operational, *off_color_operational;
                 int i, c;
 
                 sd_network_get_operational_state(&operational_state);
-                if (streq_ptr(operational_state, "routable")) {
-                        on_color_oper = ansi_highlight_green();
-                        off_color_oper = ansi_highlight_off();
-                } else if (streq_ptr(operational_state, "degraded")) {
-                        on_color_oper = ansi_highlight_yellow();
-                        off_color_oper = ansi_highlight_off();
-                }
+                operational_state_to_color(operational_state, &on_color_operational, &off_color_operational);
 
-                printf("       State: %s%s%s\n", on_color_oper, strna(operational_state), off_color_oper);
+                printf("       State: %s%s%s\n", on_color_operational, strna(operational_state), off_color_operational);
 
                 c = local_addresses(rtnl, 0, &addresses);
                 for (i = 0; i < c; i++) {