Some tidying of message output.

Thomas


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOBasic/trunk@38 b589c3ab-70e8-4b4d-a09f-cba2dd200880

1 files changed, 6 insertions, 16 deletions

diff --git a/src/WriteInfo.c b/src/WriteInfo.c
index 5be067d..26994d0 100644
--- a/src/WriteInfo.c
+++ b/src/WriteInfo.c
@@ -21,21 +21,18 @@
 
 CCTK_REAL IOBasic_WriteInfo (cGH *GH, int index, const char *operator, const char *alias)
 {
-  CCTK_REAL tt[1];
   int reduce_handle;
   CCTK_REAL retval;
 
 
   /* first, check if variable has storage assigned */
   if (! CCTK_QueryGroupStorageI (GH, CCTK_GroupIndexFromVarI (index))) {
-    char *msg, *fullname;
+    char *fullname;
 
     fullname = CCTK_FullName (index);
-    msg = (char *) malloc (200 * sizeof (char) + strlen (fullname));
-    sprintf (msg, "No info output for '%s' (no storage)", fullname);
-    CCTK_WARN (2, msg);
+    CCTK_VWarn (2, __LINE__, __FILE__, CCTK_THORNSTRING,
+                "No info output for '%s' (no storage)", fullname);
     free (fullname);
-    free (msg);
     return (0);
   }
 
@@ -43,21 +40,14 @@ CCTK_REAL IOBasic_WriteInfo (cGH *GH, int index, const char *operator, const cha
 
   if (reduce_handle > -1)
   {
-    CCTK_Reduce(GH,-1,reduce_handle,1,CCTK_VARIABLE_REAL,tt,1,index);
-    retval = tt[0];
+    CCTK_Reduce(GH,-1,reduce_handle,1,CCTK_VARIABLE_REAL,&retval,1,index);
   }
   else
   {
-    CCTK_WARN(1, "Reduction operator doesn't exist.");
-
+    CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING,
+               "Reduction operator '%s' doesn't exist", operator);
     retval = -27;
   }
 
   return retval;
-
 }
-
-
-
-
-