Changeset cddcc4a3 in mainline for uspace/app/usbinfo/main.c

Timestamp:

2012-08-14T18:16:39Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

669f5cae

Parents:

76d92db1 (diff), 4802dd7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/app/usbinfo/main.c (modified) (7 diffs)

uspace/app/usbinfo/main.c

@@ -62 +62 @@
 
         _OPTION("-h --help", "Print this help and exit.");
+        _OPTION("-l --list", "Print a list of host controllers and devices.");
         _OPTION("-i --identification", "Brief device identification.");
         _OPTION("-m --match-ids", "Print match ids generated for the device.");
@@ -82 +83 @@
         {"help", no_argument, NULL, 'h'},
         {"identification", no_argument, NULL, 'i'},
+        {"list", no_argument, NULL, 'l'},
         {"match-ids", no_argument, NULL, 'm'},
         {"descriptor-tree", no_argument, NULL, 't'},
@@ -91 +93 @@
         {0, 0, NULL, 0}
 };
-static const char *short_options = "himtTsSrR";
+static const char *short_options = "hilmtTsSrR";
 
 static usbinfo_action_t actions[] = {
@@ -146 +148 @@
         }
 
+        bool something_active = false;
         /*
          * Process command-line options. They determine what shall be
@@ -156 +159 @@
                 switch (opt) {
                         case -1:
+                                break;
+                        case 'l':
+                                list();
                                 break;
                         case '?':
@@ -168 +174 @@
                                         if (actions[idx].opt == opt) {
                                                 actions[idx].active = true;
+                                                something_active = true;
                                                 break;
                                         }
@@ -178 +185 @@
 
         /* Set the default action. */
-        int idx = 0;
-        bool something_active = false;
-        while (actions[idx].opt != 0) {
-                if (actions[idx].active) {
-                        something_active = true;
-                        break;
-                }
-                idx++;
-        }
         if (!something_active) {
                 actions[0].active = true;