Changeset 15720

Timestamp:

Nov 29, 2007, 2:41:52 PM (18 years ago)

Author:

eugene

Message:

better usage, clarify code

File:

• trunk/Ohana/src/opihi/dvo/images.c (modified) (5 diffs)

trunk/Ohana/src/opihi/dvo/images.c

@@ -22 +22 @@
   int typehash;
 
-  if (!style_args (&graphmode, &argc, argv, &kapa)) return FALSE;
+  if (!style_args (&graphmode, &argc, argv, &kapa)) goto usage;
 
   WITH_MOSAIC = FALSE;
@@ -61 +61 @@
   if ((N = get_argument (argc, argv, "-time"))) {
     remove_argument (N, &argc, argv);
-    if (!ohana_str_to_time (argv[N], &tzero)) { 
+    if (!ohana_str_to_time (argv[N], &tzero)) {
       gprint (GP_ERR, "syntax error\n");
-      return (FALSE);
+      goto usage;
     }
     remove_argument (N, &argc, argv);
     if (!ohana_str_to_dtime (argv[N], &trange)) { 
       gprint (GP_ERR, "syntax error\n");
-      return (FALSE);
+      goto usage;
     }
     remove_argument (N, &argc, argv);
@@ -81 +81 @@
     if (!ohana_str_to_time (argv[N], &tzero)) { 
       gprint (GP_ERR, "syntax error\n");
-      return (FALSE);
+      goto usage;
     }
     remove_argument (N, &argc, argv);
     if (!ohana_str_to_time (argv[N], &tend)) { 
       gprint (GP_ERR, "syntax error\n");
-      return (FALSE);
+      goto usage;
     }
     remove_argument (N, &argc, argv);
@@ -97 +97 @@
   }
  
-  if (argc != 1) {
-    gprint (GP_ERR, "USAGE: image [-time start range]\n");
-    return (FALSE);
-  }
+  if (argc != 1) goto usage;
   
   /* it is not an error for the database not to have any images */
@@ -289 +286 @@
   return (TRUE);
 
+
+ usage:
+  gprint (GP_ERR, "USAGE: image [options]\n");
+  gprint (GP_ERR, "  +mosaic : show mosaic outline\n");
+  gprint (GP_ERR, "  -mosaic : only mosaic outline\n");
+  gprint (GP_ERR, "  -hidden : (deprecated)\n");
+  gprint (GP_ERR, "  -name   : only names matching (start of name)\n");
+  gprint (GP_ERR, "  -radius : display all-sky images with given radius octagon\n");
+  gprint (GP_ERR, "  -time (start) (range)  : show images for time and interval\n");
+  gprint (GP_ERR, "  -trange (start) (stop) : show images within time range\n");
+  return (FALSE);
 }