diff options
| author | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-06-09 10:43:37 +0000 |
|---|---|---|
| committer | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-06-09 10:43:37 +0000 |
| commit | 5be8c776773b5b5847d6ff83eb9fbca4a2921a21 (patch) | |
| tree | 51b56b1de20ca69bd951082e10e21b031d0ae400 /src | |
| parent | 95c28069ce7dd1502c2114e76031930d5bef9dd4 (diff) | |
CCTK_TraverseString() returns error code (-5) if it encounters an invalid
variable or group name.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@3764 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/Groups.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/main/Groups.c b/src/main/Groups.c index a36a0733..a500fa7c 100644 --- a/src/main/Groups.c +++ b/src/main/Groups.c @@ -2052,7 +2052,8 @@ void CCTK_FCALL CCTK_FNAME (CCTK_GroupDimFromVarI) -1 no callback routine was given<BR> -2 option string is not associated with a group or variable<BR> -3 unterminated option string<BR> - -4 garbage found at end of option string + -4 garbage found at end of option string<BR> + -5 invalid token in traversed string found @endreturndesc @@*/ int CCTK_TraverseString (const char *traverse_string, @@ -2070,7 +2071,7 @@ int CCTK_TraverseString (const char *traverse_string, if (callback == NULL) { - CCTK_VWarn (5, __LINE__, __FILE__, "Cactus", + CCTK_VWarn (2, __LINE__, __FILE__, "Cactus", "CCTK_TraverseString: No callback given"); return (-1); } @@ -2160,25 +2161,26 @@ int CCTK_TraverseString (const char *traverse_string, *string = 0; if (option_string == group_var_string + 1) { - CCTK_VWarn (5, __LINE__, __FILE__, "Cactus", - "CCTK_TraverseString: option string '%s' not associated " - "with a group or variable name", option_string); + CCTK_VWarn (2, __LINE__, __FILE__, "Cactus", + "CCTK_TraverseString: option string '%s' in traversed " + "string '%s' is not associated with a group or variable " + "name", option_string, traverse_string); retval = -2; break; } else if (! (delimiter == options_end && nesting == 0)) { - CCTK_VWarn (5, __LINE__, __FILE__, "Cactus", - "CCTK_TraverseString: unterminated option string '%s'", - option_string); + CCTK_VWarn (2, __LINE__, __FILE__, "Cactus", + "CCTK_TraverseString: unterminated option string '%s' " + "in traversed string '%s'", option_string, traverse_string); retval = -3; break; } else if (! (string[1] == 0 || isspace (string[1]))) { - CCTK_VWarn (5, __LINE__, __FILE__, "Cactus", - "CCTK_TraverseString: garbage at end of option string '%s'", - option_string); + CCTK_VWarn (2, __LINE__, __FILE__, "Cactus", + "CCTK_TraverseString: garbage at end of option string '%s' " + "in traversed string '%s'", option_string, traverse_string); retval = -4; break; } @@ -2258,8 +2260,9 @@ int CCTK_TraverseString (const char *traverse_string, else { CCTK_VWarn (1, __LINE__, __FILE__, "Cactus", - "CCTK_TraverseString: Ignoring '%s' in string " - "(invalid token)", group_var_string); + "CCTK_TraverseString: invalid group/variable name '%s' in " + "traversed string '%s'", group_var_string, traverse_string); + retval = -5; } /* advance the parse string pointer */ |