Index: branches/eam_branches/ipp-20101205/Ohana/src/opihi/cmd.data/reindex.c
===================================================================
--- branches/eam_branches/ipp-20101205/Ohana/src/opihi/cmd.data/reindex.c	(revision 30115)
+++ branches/eam_branches/ipp-20101205/Ohana/src/opihi/cmd.data/reindex.c	(revision 30194)
@@ -5,5 +5,5 @@
 int reindex (int argc, char **argv) {
   
-  int  i, Npts, Nmax, valid;
+  int  i, Npts, Nmax;
   Vector *ivec, *ovec, *xvec;
 
@@ -11,13 +11,7 @@
   Npts = 0;
 
-  valid = TRUE;
-  valid &= (argc >= 6);
-  valid &= !strcmp(argv[2], "=");
-  valid &= !strcmp(argv[4], "using");
-  if (!valid) {
-    gprint (GP_ERR, "USAGE: reindex (out) = (in) using (index)\n");
-    gprint (GP_ERR, "  creates a new vectors (out) from (in) based on sequence in (index)\n");
-    return (FALSE);
-  }
+  if (argc != 6) goto usage;
+  if (strcmp(argv[2], "=")) goto usage;
+  if (strcmp(argv[4], "using")) goto usage;
 
   if ((ovec = SelectVector (argv[1], ANYVECTOR, TRUE)) == NULL) goto error;
@@ -63,4 +57,9 @@
   DeleteVector (ovec);
   return (FALSE);
+
+usage:
+    gprint (GP_ERR, "USAGE: reindex (out) = (in) using (index)\n");
+    gprint (GP_ERR, "  creates a new vectors (out) from (in) based on sequence in (index)\n");
+    return (FALSE);
 }