Finished error checking in CCTK_Equals

git-svn-id: http://svn.cactuscode.org/flesh/trunk@436 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 17 insertions, 4 deletions

diff --git a/src/util/Misc.c b/src/util/Misc.c
index 7dab703f..9c9604cc 100644
--- a/src/util/Misc.c
+++ b/src/util/Misc.c
@@ -104,11 +104,24 @@ int CCTK_Equals(const char *string1, const char *string2)
   retval = 1;
 
   /* Check that string1 isn't null */
-  if (!string1 && string2)
+  if (!string1 || !string2)
   {
-    message = (char *)malloc((100+sizeof(string2))*sizeof(char));
-    sprintf(message,"First string null in CCTK_Equals (2nd is %s)",string2); 
-    CCTK_Warn(0,message);
+    if (!string1 && string2)
+    {
+      message = (char *)malloc((100+sizeof(string2))*sizeof(char));
+      sprintf(message,"First string null in CCTK_Equals (2nd is %s)",string2); 
+      CCTK_Warn(0,message);
+    }
+    else if (string1 && !string2)
+    { 
+      message = (char *)malloc((100+sizeof(string1))*sizeof(char));
+      sprintf(message,"Second string null in CCTK_Equals (1st is %s)",string1); 
+      CCTK_Warn(0,message);
+    }     
+    else
+    {
+      CCTK_Warn(0,"Both strings null in CCTK_Equals");
+    }
   }
 
   if(strlen(string1)==strlen(string2))