Imported Upstream version 1.24

[platform/upstream/connman.git] / client / services.c

diff --git a/client/services.c b/client/services.c
index 045947c..0c18669 100644 (file)
--- a/client/services.c
+++ b/client/services.c
@@ -57,11 +57,17 @@ static void print_service(char *path, DBusMessageIter *iter)
                        dbus_message_iter_recurse(&entry, &val);
                        dbus_message_iter_get_basic(&val, &str);
 
-                       if (str != NULL) {
+                       if (str) {
                                if (strcmp(str, "online") == 0)
                                        state = 'O';
                                else if (strcmp(str, "ready") == 0)
                                        state = 'R';
+                               else if (!strcmp(str, "association"))
+                                       state = 'a';
+                               else if (!strcmp(str, "configuration"))
+                                       state = 'c';
+                               else if (!strcmp(str, "disconnect"))
+                                       state = 'd';
                        }
 
                } else if (strcmp(property, "AutoConnect") == 0) {
@@ -80,18 +86,15 @@ static void print_service(char *path, DBusMessageIter *iter)
        }
 
        str = strrchr(path, '/');
-       if (str != NULL)
+       if (str)
                str++;
        else
                str = path;
 
-       if (count > 0) {
-               if (*name == '\0')
-                       name = "<hidden>";
-
+       if (count > 0)
                fprintf(stdout, "%c%c%c %-20s %s", favorite != 0 ? '*' : ' ',
                                autoconn != 0 ? 'A' : ' ', state, name, str);
-       } else
+       else
                fprintf(stdout, "%-24s %s", "unchanged", str);
 
 }
@@ -117,7 +120,7 @@ static void list_service_array(DBusMessageIter *iter)
                        print_service(path, &dict);
                }
 
-               if (dbus_message_iter_has_next(iter) == TRUE)
+               if (dbus_message_iter_has_next(iter))
                        fprintf(stdout, "\n");
 
                dbus_message_iter_next(iter);