Index: trunk/psLib/src/collections/psMetadata.c
===================================================================
--- trunk/psLib/src/collections/psMetadata.c	(revision 4308)
+++ trunk/psLib/src/collections/psMetadata.c	(revision 4321)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-17 23:44:21 $
+*  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -267,5 +267,5 @@
 }
 
-psBool psMetadataAddItem(psMetadata *md, psMetadataItem *metadataItem, psS32 location, psS32 flags)
+bool psMetadataAddItem(psMetadata *md, psMetadataItem *metadataItem, psS32 location, psS32 flags)
 {
     char * key = NULL;
@@ -359,11 +359,11 @@
 }
 
-psBool psMetadataAdd(psMetadata *md, psS32 location, const char *name,
-                     psS32 type, const char *comment, ...)
+bool psMetadataAdd(psMetadata *md, int location, const char *name,
+                   int format, const char *comment, ...)
 {
     va_list argPtr;
 
     va_start(argPtr, comment);
-    psBool result = psMetadataAddV(md,location,name,type,comment,argPtr);
+    psBool result = psMetadataAddV(md,location,name,format,comment,argPtr);
     va_end(argPtr);
 
@@ -371,12 +371,12 @@
 }
 
-psBool psMetadataAddV(psMetadata *md, psS32 location, const char *name,
-                      psS32 type, const char *comment, va_list list)
+bool psMetadataAddV(psMetadata *md, int location, const char *name,
+                    int format, const char *comment, va_list list)
 {
     psMetadataItem* metadataItem = NULL;
 
-    metadataItem = psMetadataItemAllocV(name, type & PS_METADATA_TYPE_MASK, comment, list);
-
-    if (!psMetadataAddItem(md, metadataItem, location, type & PS_METADATA_FLAGS_MASK)) {
+    metadataItem = psMetadataItemAllocV(name, format & PS_METADATA_TYPE_MASK, comment, list);
+
+    if (!psMetadataAddItem(md, metadataItem, location, format & PS_METADATA_FLAGS_MASK)) {
         psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_FAILED);
         psFree(metadataItem);
@@ -475,5 +475,5 @@
 }
 
-psMetadataItem* psMetadataLookup(psMetadata *md, const char *key)
+psMetadataItem* psMetadataLookup(const psMetadata *md, const char *key)
 {
     psHash* mdTable = NULL;
@@ -491,5 +491,5 @@
 }
 
-void* psMetadataLookupPtr(psBool *status, psMetadata *md, const char *key)
+void* psMetadataLookupPtr(bool *status, const psMetadata *md, const char *key)
 {
     psMetadataItem *metadataItem = NULL;
@@ -525,5 +525,5 @@
 
 #define psMetadataLookupNumTYPE(TYPE) \
-ps##TYPE psMetadataLookup##TYPE(psBool *status, psMetadata *md, const char *key) \
+ps##TYPE psMetadataLookup##TYPE(bool *status, const psMetadata *md, const char *key) \
 { \
     psMetadataItem *metadataItem = NULL; \
@@ -630,6 +630,6 @@
 }
 
-psBool psMetadataIteratorSet(psMetadataIterator* iterator,
-                             int location)
+bool psMetadataIteratorSet(psMetadataIterator* iterator,
+                           int location)
 {
     int match;