aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortradke <tradke@7842ec3a-9562-4be5-9c5b-06ba18f2b668>2000-12-04 13:03:55 +0000
committertradke <tradke@7842ec3a-9562-4be5-9c5b-06ba18f2b668>2000-12-04 13:03:55 +0000
commitacea67baca75e4a83a3c57f2d39d64edb060cbcb (patch)
tree020e635fbd0e097fa9ae1b0b4d26eaea7216a43e
parent5f9e18c0eeb6a40a8d066b78d40ad10bd87e27b9 (diff)
Bugfix parsing hyperslab direction parameter.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOHDF5Util/trunk@16 7842ec3a-9562-4be5-9c5b-06ba18f2b668
-rw-r--r--src/ParseVars.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/ParseVars.c b/src/ParseVars.c
index 67ac1df..202b09d 100644
--- a/src/ParseVars.c
+++ b/src/ParseVars.c
@@ -5,8 +5,7 @@
@desc
IOUtil GH extension stuff.
@enddesc
- @history
- @endhistory
+ @version $Id$
@@*/
#include <stdlib.h>
@@ -22,7 +21,7 @@
/* the rcs ID and its dummy function to use it */
static char *rcsid = "$Id$";
-CCTK_FILEVERSION(BetaThorns_IOStreamedHDF5_ParseVars_c)
+CCTK_FILEVERSION(BetaThorns_IOHDF5Util_ParseVars_c)
/* prototypes of routines defined in this source file */
@@ -170,7 +169,7 @@ static void IOHDF5Util_ParseOutputRequest (int vindex,
matched = CCTK_RegexMatch (substring, regexstring, new_request->sdim + 1,
dmatch);
free (regexstring);
- if (matched != new_request->sdim)
+ if (matched <= 0)
{
CCTK_VWarn (2, __LINE__, __FILE__, CCTK_THORNSTRING,
"Couldn't parse direction vectors in hyperslab "
@@ -204,13 +203,13 @@ static void IOHDF5Util_ParseOutputRequest (int vindex,
free (parsestring);
}
free (substring);
- if (i < new_request->vdim)
- {
- CCTK_VWarn (2, __LINE__, __FILE__, CCTK_THORNSTRING,
- "Direction vectors are incomplete or missing in hyperslab "
- "parameter '%s'.", optstring);
- free (new_request);
- return;
+ if (i < new_request->vdim)
+ {
+ CCTK_VWarn (2, __LINE__, __FILE__, CCTK_THORNSTRING,
+ "Direction vectors are incomplete or missing in hyperslab "
+ "parameter '%s'.", optstring);
+ free (new_request);
+ return;
}
}
}