Changeset 25757 for trunk/Ohana/src/opihi/cmd.data/subset.c

Timestamp:

Oct 2, 2009, 3:15:42 PM (17 years ago)

Author:

eugene

Message:

various dvo and other improvements from gene@dev branch

File:

• trunk/Ohana/src/opihi/cmd.data/subset.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.data/subset.c

@@ -6 +6 @@
   
   char *out;
-  int  i, Npts, size;
+  int  i, Npts, size, valid;
   Vector *ivec, *ovec, *tvec;
 
@@ -12 +12 @@
   ivec = ovec = tvec = NULL;
 
-  if ((argc < 6) || strcmp(argv[2], "=") || strcmp (argv[4], "if")) {
-    gprint (GP_ERR, "SYNTAX: subset vec = vec if (logic expression)\n");
+  valid = TRUE;
+  valid &= (argc >= 6);
+  valid &= !strcmp(argv[2], "=");
+  valid &= !strcmp(argv[4], "if") || !strcmp (argv[4], "where");
+  if (!valid) {
+    gprint (GP_ERR, "SYNTAX: subset vec = vec [if/where] (logic expression)\n");
     return (FALSE);
   }
@@ -76 +80 @@
   return (TRUE);
 
- error:
+error:
   DeleteVector (tvec);
   DeleteVector (ovec);