Changed char * to const char * in CCTK_NewHandle.

Added StoreHandledData.c to make.code.defn.

Tom


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

2 files changed, 40 insertions, 15 deletions

diff --git a/src/util/StoreHandledData.c b/src/util/StoreHandledData.c
index 65419a60..f563d243 100644
--- a/src/util/StoreHandledData.c
+++ b/src/util/StoreHandledData.c
@@ -44,7 +44,7 @@ static int FindNextUnused(cHandledData *storage, int first);
 
 @@*/
 
-int CCTK_NewHandle(cHandledData **storage, char *name, void *data)
+int CCTK_NewHandle(cHandledData **storage, const char *name, void *data)
 {
   int return_code;
 
@@ -230,18 +230,26 @@ void *CCTK_GetHandledData(cHandledData *storage, int handle)
 {
   void *data;
 
-  if((handle < storage->array_size)&&
-     (handle >= 0)&&
-     (storage->array[handle].in_use == TRUE))
+  if(storage)
   {
-    /* The data exists */
-    data = storage->array[handle].data;
+    if((handle < storage->array_size)&&
+       (handle >= 0)&&
+       (storage->array[handle].in_use == TRUE))
+    {
+      /* The data exists */
+      data = storage->array[handle].data;
+    }
+    else
+    {
+      /* The data is non-existant. */
+      data = NULL;
+    }
   }
   else
   {
-    /* The data is non-existant. */
+    /* There is no data registered. */
     data = NULL;
-  };
+  }
 
   return data;
 }
@@ -267,17 +275,32 @@ int CCTK_GetHandle(cHandledData *storage, const char *name, void **data)
   int current;
 
   handle = -1;
-  *data = NULL;
 
-  for(current = 0; current < storage->array_size; current++)
+  if(data)
+  {
+    *data = NULL;
+  }
+
+  if(storage)
   {
-    if(!strcmp(name, storage->array[current].name))
+    for(current = 0; current < storage->array_size; current++)
     {
-      handle = current;
-      *data = storage->array[current].data;
-      break;
+      if(!strcmp(name, storage->array[current].name))
+      {
+	handle = current;
+	/* Return the associated data if required. */
+	if(data)
+	{
+	  *data = storage->array[current].data;
+	};
+	break;
+      }
     }
   }
+  else
+  {
+    handle = -2;
+  }
 
   return handle;
 }
diff --git a/src/util/make.code.defn b/src/util/make.code.defn
index df764ec2..10c0d7cb 100644
--- a/src/util/make.code.defn
+++ b/src/util/make.code.defn
@@ -7,6 +7,8 @@ StoreKeyedData.c\
 StoreNamedData.c\
 Misc.c\
 getopt.c\
-getopt1.c
+getopt1.c\
+StoreHandledData.c
+