diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-07-06 20:21:32 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-07-06 20:21:32 +0000 |
| commit | 849e861ffd5e6c6a25be82053ef49709ca8684b3 (patch) | |
| tree | e235d9a62182e96cc501004b176bfe7f209cb19a /src | |
| parent | 629a02f1004737f768f25ecd35531c2255ed2e1f (diff) | |
Updated CCTK_SetLogical to use CCTK_INT.
Moved a ONE_FORTSTRING_ARG to end of variable declarations so
that it can contain non-declarations.
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@683 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/Misc.h | 2 | ||||
| -rw-r--r-- | src/util/Misc.c | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/include/Misc.h b/src/include/Misc.h index 455a2d1f..35dc47d8 100644 --- a/src/include/Misc.h +++ b/src/include/Misc.h @@ -35,7 +35,7 @@ int CCTK_SetIntInRangeList(CCTK_INT *data, const char *value, int CCTK_SetKeywordInRangeList(char **data, const char *value, int n_elements, ...); int CCTK_SetString(char **data, const char *value); -int CCTK_SetLogical(int *data, const char *value); +int CCTK_SetLogical(CCTK_INT *data, const char *value); #ifdef __cplusplus } diff --git a/src/util/Misc.c b/src/util/Misc.c index 3eb371bb..39159e01 100644 --- a/src/util/Misc.c +++ b/src/util/Misc.c @@ -152,8 +152,8 @@ int CCTK_Equals(const char *string1, const char *string2) int FMODIFIER FORTRAN_NAME(CCTK_Equals)(const char **arg1,ONE_FORTSTRING_ARG) { - ONE_FORTSTRING_CREATE(arg2) int retval; + ONE_FORTSTRING_CREATE(arg2) retval = CCTK_Equals(*arg1,arg2); free(arg2); return(retval); @@ -666,7 +666,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_PrintString)(char **arg1) @endhistory @@*/ -int CCTK_SetLogical(int *data, const char *value) +int CCTK_SetLogical(CCTK_INT *data, const char *value) { int retval = 1; @@ -728,3 +728,13 @@ int CCTK_RegexMatch(const char *string, } return(1); } + + + + + + + + + + |