aboutsummaryrefslogtreecommitdiff
path: root/src/Ell_DBstructure.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/Ell_DBstructure.c')
-rw-r--r--src/Ell_DBstructure.c73
1 files changed, 34 insertions, 39 deletions
diff --git a/src/Ell_DBstructure.c b/src/Ell_DBstructure.c
index f3592ca..08624e3 100644
--- a/src/Ell_DBstructure.c
+++ b/src/Ell_DBstructure.c
@@ -98,13 +98,13 @@ int Ell_CreateKey(int vartype, const char *keychain)
{
if (!CCTK_Equals(elliptic_verbose,"no"))
{
- char *msg;
- const char *name=CCTK_VarTypeName(vartype);
- msg = (char *)malloc(
- (200 + strlen(keychain) + strlen(name) )*sizeof(char) );
+ char *msg;
+ const char *name=CCTK_VarTypeName(vartype);
+ msg = (char *)malloc(
+ (200 + strlen(keychain) + strlen(name) )*sizeof(char) );
sprintf(msg,"Failed to create %s (%s)",keychain,name);
- CCTK_INFO(msg);
- free(msg);
+ CCTK_INFO(msg);
+ free(msg);
}
retval = ELLCREATE_FAILED;
}
@@ -112,13 +112,13 @@ int Ell_CreateKey(int vartype, const char *keychain)
{
if (!CCTK_Equals(elliptic_verbose,"no"))
{
- char *msg;
- const char *name=CCTK_VarTypeName(vartype);
- msg = (char *)malloc(
- (200 + strlen(keychain) + strlen(name) )*sizeof(char) );
+ char *msg;
+ const char *name=CCTK_VarTypeName(vartype);
+ msg = (char *)malloc(
+ (200 + strlen(keychain) + strlen(name) )*sizeof(char) );
sprintf(msg,"Created %s (%s)",keychain,name);
- CCTK_INFO(msg);
- free(msg);
+ CCTK_INFO(msg);
+ free(msg);
}
retval = 0;
}
@@ -163,7 +163,7 @@ int Ell_UnsetKey(const char *keychain)
if (!(getme))
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetRealKey: Cannot get structure with key %s",keychain);
+ "Ell_GetRealKey: Cannot get structure with key %s",keychain);
retval = ELLGET_NOKEY;
}
else
@@ -206,8 +206,8 @@ int Ell_SetRealKey(CCTK_REAL value, const char *keychain)
{
retval = ELLSET_BADTYPE;
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_SetRealKey: Key %s not of type CCTK_REAL (type %d)",
- keychain,setme->type);
+ "Ell_SetRealKey: Key %s not of type CCTK_REAL (type %d)",
+ keychain,setme->type);
}
else
{
@@ -242,7 +242,7 @@ int Ell_SetIntKey(CCTK_INT value, const char *keychain)
{
retval = ELLSET_BADTYPE;
printf("Ell_SetIntKey: The key you try to set is not of type CCTK_INT: >%s< (type %d)\n",
- keychain,setme->type);
+ keychain,setme->type);
}
else {
setme->type = CCTK_VARIABLE_INT;
@@ -275,8 +275,8 @@ int Ell_SetStrKey(char *value, const char *keychain)
{
retval = ELLSET_BADTYPE;
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_SetStrKey: Key %s not of type STRING (type %d)",
- keychain,setme->type);
+ "Ell_SetStrKey: Key %s not of type STRING (type %d)",
+ keychain,setme->type);
}
else
{
@@ -311,22 +311,22 @@ int Ell_GetRealKey(CCTK_REAL *value, const char *keychain)
if (!(getme))
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetRealKey: Cannot get structure for key %s",keychain);
+ "Ell_GetRealKey: Cannot get structure for key %s",keychain);
retval = ELLGET_NOKEY;
}
else if (getme->type!=CCTK_VARIABLE_REAL)
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetRealKey: Not getting a CCTK_REAL value off key %s "
- "type %d (need %d)\n",
- keychain,getme->type,CCTK_VARIABLE_REAL);
+ "Ell_GetRealKey: Not getting a CCTK_REAL value off key %s "
+ "type %d (need %d)\n",
+ keychain,getme->type,CCTK_VARIABLE_REAL);
retval = ELLGET_BADTYPE;
}
else if (getme->been_set==ELL_NO)
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetRealKey: Key %s has not been set to any value",
- keychain);
+ "Ell_GetRealKey: Key %s has not been set to any value",
+ keychain);
retval = ELLGET_NOTSET;
}
else
@@ -362,16 +362,16 @@ int Ell_GetIntKey(CCTK_INT *value,const char *keychain)
else if (getme->type!=CCTK_VARIABLE_INT)
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetIntKey: Not getting a CCTK_INT value from key %s "
- "(type %d)",
- keychain,getme->type);
+ "Ell_GetIntKey: Not getting a CCTK_INT value from key %s "
+ "(type %d)",
+ keychain,getme->type);
retval = ELLGET_BADTYPE;
}
else if (getme->been_set==ELL_NO)
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetIntKey: Key %s has not been set to any value (type %d)",
- keychain,getme->type);
+ "Ell_GetIntKey: Key %s has not been set to any value (type %d)",
+ keychain,getme->type);
retval = ELLGET_NOTSET;
}
else
@@ -404,20 +404,20 @@ int Ell_GetStrKey(char **value, const char *keychain)
if (!(getme))
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetStrKey: Cannot get structure with key %s",keychain);
+ "Ell_GetStrKey: Cannot get structure with key %s",keychain);
retval = ELLGET_NOKEY;
}
else if (getme->type!=CCTK_VARIABLE_STRING)
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetStrKey: Not getting a CCTK_STRING from this key %s "
- "type: %d", keychain,getme->type);
+ "Ell_GetStrKey: Not getting a CCTK_STRING from this key %s "
+ "type: %d", keychain,getme->type);
retval = ELLGET_BADTYPE;
}
else if (getme->been_set==ELL_NO)
{
CCTK_VWarn(4,__LINE__,__FILE__,CCTK_THORNSTRING,
- "Ell_GetStrKey: Key %s has not been set", keychain);
+ "Ell_GetStrKey: Key %s has not been set", keychain);
retval = ELLGET_NOTSET;
}
else
@@ -440,7 +440,7 @@ void CCTK_FCALL CCTK_FNAME(Ell_GetStrKey)
char *message;
message = (char *)malloc( (200+strlen(*cstring))*sizeof(char) );
sprintf(message,"Cannot output %s to char* of length %d\n",
- *cstring,cctk_strlen1);
+ *cstring,cctk_strlen1);
CCTK_Warn (1,__LINE__,__FILE__,"Cactus",message);
free(message);
*nchar = -1;
@@ -462,8 +462,3 @@ void CCTK_FCALL CCTK_FNAME(Ell_GetStrKey)
free(fstring);
}
-
-
-
-
-