Changeset 28003 for branches/pap/Ohana/src/opihi/cmd.basic/opihi.c

Timestamp:

May 18, 2010, 12:49:05 PM (16 years ago)

Author:

eugene

Message:

merging changes from trunk into branches/pap

Location:

branches/pap

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/cmd.basic/opihi.c (modified) (2 diffs)

branches/pap/Ohana/src/opihi/cmd.basic/opihi.c

@@ -3 +3 @@
 int opihi_setmode (int argc, char **argv) {
 
-  int value;
+  OpihiVerboseMode value;
 
   if (argc < 2) {
-    gprint (GP_ERR, "USAGE: opihi (verbose) [on/off]\n");
+    gprint (GP_ERR, "USAGE: opihi (verbose) [on/off/error]\n");
     return (FALSE);
   }
@@ -13 +13 @@
       if (argc == 2) {
           value = get_verbose_shell();
-          if (value) {
-            gprint (GP_ERR, "opihi verbose mode: on\n");
-          } else {
-            gprint (GP_ERR, "opihi verbose mode: off\n");
-          }
+          switch (value) {
+            case OPIHI_VERBOSE_OFF:
+              gprint (GP_ERR, "opihi verbose mode: off\n");
+              break;
+            case OPIHI_VERBOSE_ON:
+              gprint (GP_ERR, "opihi verbose mode: on\n");
+              break;
+            case OPIHI_VERBOSE_ERROR:
+              gprint (GP_ERR, "opihi verbose mode: error\n");
+              break;
+            default:
+              fprintf (stderr, "impossible condition\n");
+              abort();
+          } 
           return (TRUE);
       }
       if (!strcasecmp(argv[2], "on")) {
-        set_verbose_shell (TRUE);
+        set_verbose_shell (OPIHI_VERBOSE_ON);
         return (TRUE);
       }
       if (!strcasecmp(argv[2], "off")) {
-        set_verbose_shell (FALSE);
+        set_verbose_shell (OPIHI_VERBOSE_OFF);
+        return (TRUE);
+      }
+      if (!strcasecmp(argv[2], "error")) {
+        set_verbose_shell (OPIHI_VERBOSE_ERROR);
         return (TRUE);
       }