Changes in uspace/app/usbinfo/main.c [32260a0:9d58539] in mainline

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.");
@@ -83 +82 @@
         {"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'},
@@ -93 +91 @@
         {0, 0, NULL, 0}
 };
-static const char *short_options = "hilmtTsSrR";
+static const char *short_options = "himtTsSrR";
 
 static usbinfo_action_t actions[] = {
@@ -148 +146 @@
         }
 
-        bool something_active = false;
         /*
          * Process command-line options. They determine what shall be
@@ -159 +156 @@
                 switch (opt) {
                         case -1:
-                                break;
-                        case 'l':
-                                list();
                                 break;
                         case '?':
@@ -174 +168 @@
                                         if (actions[idx].opt == opt) {
                                                 actions[idx].active = true;
-                                                something_active = true;
                                                 break;
                                         }
@@ -185 +178 @@
 
         /* 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;