1 files changed, 16 insertions, 37 deletions

diff --git a/src/Ell_Register.c b/src/Ell_Register.c
index ce791d1..dcc50a7 100644
--- a/src/Ell_Register.c
+++ b/src/Ell_Register.c
@@ -44,39 +44,29 @@ int Ell_RegisterEq(void *(function)(const char *, void*), const char *eqname)
   DECLARE_CCTK_PARAMETERS
 
   int retval = ELL_FAILURE;
+
   /* Register if function not already there with this name */
 
   if (!GetNamedData(EqNameDB, eqname))
   {
-
     if (StoreNamedData(&EqNameDB, eqname, (void*)function)==0)
     {
       if CCTK_EQUALS(elliptic_verbose,"yes") 
       {
-	char *msg;
-	msg = (char *)malloc( (200+strlen(eqname))*sizeof(char) );
-	sprintf(msg,"Registered elliptic class: %s",eqname);
-	CCTK_INFO(msg);
-	free(msg);
+	CCTK_VInfo(CCTK_THORNSTRING,"Registered elliptic class: %s",eqname);
       }
       retval = ELL_SUCCESS;
     }
     else
     {
-      char *msg;
-      msg = (char *)malloc( (200+strlen(eqname))*sizeof(char) );
-      sprintf(msg,"Failed to register elliptic class: %s",eqname);
-      CCTK_INFO(msg);
-      free(msg);
+      CCTK_VInfo(CCTK_THORNSTRING,"Failed to register elliptic class: %s",
+		 eqname);
     }
   }
   else
   {
-    char *msg;
-    msg = (char *)malloc( (200+strlen(eqname))*sizeof(char) );
-    sprintf(msg,"Elliptic class %s already registered",eqname);
-    CCTK_WARN(0,msg);
-    free(msg);
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
+	       "Elliptic class %s already registered",eqname);
     retval = ELL_CLASSEXISTS;
   }
 
@@ -108,7 +98,7 @@ int Ell_RegisterSolver(void (*function),
   int ierr;
   int (*fn)(void *, const char *);
 
-  fn = (int(*)(void (*function), const char *sname))
+  fn = (int(*)(void (*func), const char *solvename))
     GetNamedData(EqNameDB, eqname);
 
   if (fn)
@@ -121,43 +111,32 @@ int Ell_RegisterSolver(void (*function),
 
       if CCTK_EQUALS(elliptic_verbose,"yes") 
       {
-	char *msg;
-	msg = (char *)malloc((200+strlen(eqname)+strlen(sname))*sizeof(char));
-	sprintf(msg,"Registered elliptic solver %s for %s",sname,eqname);
-	CCTK_INFO(msg);
-	free(msg);
+	CCTK_VInfo(CCTK_THORNSTRING,
+		   "Registered elliptic solver %s for %s",sname,eqname);
       }
       
       retval = ELL_SUCCESS;
     }
     else if (ierr==ELL_SOLVEREXISTS)
     {
-      char *msg;
-      msg = (char *)malloc((200+strlen(eqname)+strlen(sname))*sizeof(char));
-      sprintf(msg,"Registered second solver %s for %s",sname,eqname);
-      CCTK_WARN(0,msg);
-      free(msg);
-
+      CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
+		 "Ell_RegisterSolver: "
+		 "Registered second solver %s for %s",sname,eqname);
       retval = ELL_SOLVEREXISTS;
     }
     else 
     {
-      char *msg;
-      msg = (char *)malloc((200+strlen(eqname)+strlen(sname))*sizeof(char));
-      sprintf(msg,"Failed to register solver %s for %s",sname,eqname);
-      CCTK_WARN(1,msg);
-      free(msg);
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
+		 "Ell_RegisterSolver: "
+		 "Failed to register solver %s for %s",sname,eqname);
     }
 
   }
   else
   {
-    CCTK_WARN(0,"Cannot get function in EqName");
+    CCTK_WARN(0,"Ell_RegisterSolver: Cannot get function in EqName");
     retval = ELL_NOCLASS;
   }
     
   return retval; 
-
-  
-
 }