From 5784e5fc433e446acddcc8fe740d838d64678def Mon Sep 17 00:00:00 2001
From: rideout <rideout@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Mon, 20 May 2002 22:07:22 +0000
Subject: Improved format of "unable to set parameter" errors.

Fixes Cactus/1063.


git-svn-id: http://svn.cactuscode.org/flesh/trunk@2835 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 src/main/Parameters.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/main/Parameters.c b/src/main/Parameters.c
index b16c839b..519150ce 100644
--- a/src/main/Parameters.c
+++ b/src/main/Parameters.c
@@ -1097,6 +1097,7 @@ static t_param *ParameterFind (const char *name,
   t_param *retval;
   t_paramtreenode *node;
   t_paramlist *list;
+
   char *basename;
   int   array_index;
 
@@ -1962,8 +1963,8 @@ static int ParameterSetKeyword (t_param *param, const char *value)
   if (retval == -1)
   {
     CCTK_VWarn (2, __LINE__, __FILE__, "Cactus",
-                "ParameterSetKeyword: Unable to set keyword %s::%s - '%s' not "
-                "in any active range",
+                "ParameterSetKeyword: Unable to set keyword '%s::%s', "
+		"new value '%s' is not in any active range",
                 param->props->thorn, param->props->name, value);
 
     if (*(char **) param->data == NULL)
@@ -2005,8 +2006,8 @@ static int ParameterSetString (t_param *param, const char *value)
   if (retval == -1)
   {
     CCTK_VWarn (2, __LINE__, __FILE__, "Cactus",
-                "ParameterSetString: Unable to set string '%s::%s' - '%s' not "
-                "in any active range",
+                "ParameterSetString: Unable to set string '%s::%s', "
+		"new value '%s' is not in any active range",
                 param->props->thorn, param->props->name, value);
 
     if (*(char **) param->data == NULL)
@@ -2048,7 +2049,7 @@ static int ParameterSetSentence (t_param *param, const char *value)
   if (retval == -1)
   {
     CCTK_VWarn (2, __LINE__, __FILE__, "Cactus",
-                "ParameterSetSentance: Unable to set sentance '%s::%s' - '%s' "
+                "ParameterSetSentence: Unable to set sentence '%s::%s' = '%s' "
                 "not in any active range",
                 param->props->thorn, param->props->name, value);
 
@@ -2101,7 +2102,7 @@ static int ParameterSetInteger (t_param *param, const char *value)
   if (retval == -1)
   {
     CCTK_VWarn (2, __LINE__, __FILE__, "Cactus",
-                "ParameterSetInteger: Unable to set integer '%s::%s' - '%s' "
+                "ParameterSetInteger: Unable to set integer '%s::%s' = '%s' "
                 "not in any active range",
                 param->props->thorn, param->props->name, value);
   }
@@ -2171,7 +2172,7 @@ static int ParameterSetReal (t_param *param, const char *value)
   if (retval == -1)
   {
     CCTK_VWarn (2, __LINE__, __FILE__, "Cactus",
-                "ParameterSetReal: Unable to set real '%s:%s' - '%s' not in "
+                "ParameterSetReal: Unable to set real '%s::%s' = '%s' not in "
                 "any active range",
                 param->props->thorn, param->props->name, value);
   }
@@ -2196,7 +2197,7 @@ static int ParameterSetBoolean (t_param *param, const char *value)
   if (retval == -1)
   {
     CCTK_VWarn (2, __LINE__, __FILE__, "Cactus",
-                "ParameterSetBoolean: Unable to set boolean '%s::%s' - '%s' "
+                "ParameterSetBoolean: Unable to set boolean '%s::%s' = '%s' "
                 "not recognised",
                 param->props->thorn, param->props->name, value);
   }
-- 
cgit v1.2.3