summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2000-02-01 19:46:24 +0000
committertradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2000-02-01 19:46:24 +0000
commit76a9fb36ab3e1308269609006f0e301a37c6dfd1 (patch)
tree7bd39ea690102390ecfe2b4037a2667f959ed317
parent579b25d7bf4edd7f1cee89140336a73a08d5ae6a (diff)
Changed
CCTK_ImpFromVarI CCTK_VarName CCTK_VarTypeName to return a const pointer which shouldn't be freed after usage. git-svn-id: http://svn.cactuscode.org/flesh/trunk@1332 17b73243-c579-4c4c-a9d2-2d5706c11dac
-rw-r--r--src/IO/IOMethods.c2
-rw-r--r--src/include/cctk_Groups.h6
-rw-r--r--src/main/Groups.c8
3 files changed, 8 insertions, 8 deletions
diff --git a/src/IO/IOMethods.c b/src/IO/IOMethods.c
index d592a1de..68e27f60 100644
--- a/src/IO/IOMethods.c
+++ b/src/IO/IOMethods.c
@@ -795,7 +795,7 @@ int CCTKi_rfrTriggerSaysGo(cGH *GH, int variable)
int CCTKi_rfrTriggerAction(void *GH, int variable)
{
- char *varname;
+ const char *varname;
char *fullvarname;
int handle;
int nmethods;
diff --git a/src/include/cctk_Groups.h b/src/include/cctk_Groups.h
index 3a6ac9c1..de8de9ab 100644
--- a/src/include/cctk_Groups.h
+++ b/src/include/cctk_Groups.h
@@ -51,7 +51,7 @@ int CCTK_GroupTypeFromVarI(int var);
int CCTK_GroupTypeNumber(const char *type);
int CCTK_GroupTypeI(int group);
-char *CCTK_ImpFromVarI(int var);
+const char *CCTK_ImpFromVarI(int var);
int CCTK_MaxDim(void);
@@ -63,10 +63,10 @@ int CCTK_NumVarsInGroup(const char *group);
int CCTK_NumVarsInGroupI(int group);
int CCTK_VarIndex(const char *variablename);
-char *CCTK_VarName(int varnum);
+const char *CCTK_VarName(int varnum);
int CCTK_VarTypeI(int var);
int CCTK_VarTypeNumber(const char *type);
-char *CCTK_VarTypeName(int vartype);
+const char *CCTK_VarTypeName(int vartype);
int CCTK_VarTypeSize(int vtype);
diff --git a/src/main/Groups.c b/src/main/Groups.c
index efec21d6..7f32d12d 100644
--- a/src/main/Groups.c
+++ b/src/main/Groups.c
@@ -760,7 +760,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_GroupIndexFromVar)(int *index,ONE_FORTSTRING_A
@endhistory
@@*/
-char *CCTK_ImpFromVarI(int var)
+const char *CCTK_ImpFromVarI(int var)
{
char *retval;
int group_num;
@@ -798,7 +798,7 @@ char *CCTK_ImpFromVarI(int var)
char *CCTK_FullName(int var)
{
char *impname;
- char *varname;
+ const char *varname;
int group_num;
char *fullname=NULL;
@@ -963,7 +963,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_VarTypeNumber)(int *number,ONE_FORTSTRING_ARG)
@endhistory
@@*/
-char *CCTK_VarTypeName(int vtype)
+const char *CCTK_VarTypeName(int vtype)
{
char *retval;
@@ -1121,7 +1121,7 @@ int CCTK_GroupData(int group, cGroup *gp)
@@*/
-char *CCTK_VarName(int varnum)
+const char *CCTK_VarName(int varnum)
{
char *name;
int group;