Changeset 27840 for branches/simtest_nebulous_branches/Ohana/src/opihi/cmd.data/subset.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

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

branches/simtest_nebulous_branches/Ohana/src/opihi/cmd.data/subset.c

@@ -6 +6 @@
   
   char *out;
-  int  i, Npts, size;
+  int  i, Npts, size, valid;
   Vector *ivec, *ovec, *tvec;
 
   out = NULL;
   ivec = ovec = tvec = NULL;
+  Npts = 0;
 
-  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 +81 @@
   return (TRUE);
 
- error:
+error:
   DeleteVector (tvec);
   DeleteVector (ovec);