Index: trunk/psLib/src/collections/psMetadata.h
===================================================================
--- trunk/psLib/src/collections/psMetadata.h	(revision 1970)
+++ trunk/psLib/src/collections/psMetadata.h	(revision 2204)
@@ -11,6 +11,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-06 01:06:27 $
+*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-27 00:57:30 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -38,11 +38,11 @@
     PS_META_F32,                       ///< Single-precision float data.
     PS_META_F64,                       ///< Double-precision float data.
-    PS_META_STR,                       ///< String data (Stored in as void *).
-    PS_META_VEC,                       ///< Vector data (Stored in as void *).
-    PS_META_IMG,                       ///< Image data (Stored in as void *).
-    PS_META_JPEG,                      ///< JPEG data (Stored in as void *).
-    PS_META_PNG,                       ///< PNG data (Stored in as void *).
-    PS_META_ASTROM,                    ///< Astrometric coefficients (Stored in as void *).
-    PS_META_UNKNOWN,                   ///< Other data (Stored in as void *).
+    PS_META_STR,                       ///< String data (Stored in as psPtr ).
+    PS_META_VEC,                       ///< Vector data (Stored in as psPtr ).
+    PS_META_IMG,                       ///< Image data (Stored in as psPtr ).
+    PS_META_JPEG,                      ///< JPEG data (Stored in as psPtr ).
+    PS_META_PNG,                       ///< PNG data (Stored in as psPtr ).
+    PS_META_ASTROM,                    ///< Astrometric coefficients (Stored in as psPtr ).
+    PS_META_UNKNOWN,                   ///< Other data (Stored in as psPtr ).
     PS_META_NTYPE                      ///< Number of types. Must be last.
 } psMetadataType;
@@ -55,13 +55,13 @@
 typedef struct psMetadataItem
 {
-    const int id;                      ///< Unique ID for metadata item.
+    const psS32 id;                      ///< Unique ID for metadata item.
     char *restrict name;               ///< Name of metadata item.
     psMetadataType type;               ///< Type of metadata item.
     union {
-        bool B;                        ///< boolean data
+        psBool B;                        ///< boolean data
         psS32 S32;                     ///< Signed 32-bit integer data.
         psF32 F32;                     ///< Single-precision float data.
         psF64 F64;                     ///< Double-precision float data.
-        psPTR V;                       ///< Pointer to other type of data.
+        psPtr V;                       ///< Pointer to other type of data.
     } data;                            ///< Union for data types.
     char *comment;                     ///< Optional comment ("", not NULL).
@@ -144,8 +144,8 @@
  *  @return bool: True for success, false for failure.
  */
-bool psMetadataAddItem(
+psBool psMetadataAddItem(
     psMetadata* restrict md,           ///< Metadata collection to insert metadat item.
     psMetadataItem* restrict item,     ///< Metadata item to be added.
-    int location                       ///< Location to be added.
+    psS32 location                       ///< Location to be added.
 );
 
@@ -156,7 +156,7 @@
  * @return bool: True for success, false for failure.
  */
-bool psMetadataAdd(
-    psMetadata* restrict md,           ///< Metadata collection to insert metadat item.
-    int where,                         ///< Location to be added.
+psBool psMetadataAdd(
+    psMetadata* restrict md,           ///< Metadata collection to insert metadat item.
+    psS32 where,                         ///< Location to be added.
     const char *name,                  ///< Name of metadata item.
     psMetadataType type,               ///< Type of metadata item.
@@ -175,7 +175,7 @@
  * @return bool: True for success, false for failure.
  */
-bool psMetadataRemove(
-    psMetadata* restrict md,           ///< Metadata collection to insert metadat item.
-    int where,                         ///< Location to be removed.
+psBool psMetadataRemove(
+    psMetadata* restrict md,           ///< Metadata collection to insert metadat item.
+    psS32 where,                         ///< Location to be removed.
     const char *restrict key           ///< Name of metadata key.
 );
@@ -203,5 +203,5 @@
 psMetadataItem* psMetadataGet(
     psMetadata* restrict md,           ///< Metadata collection to insert metadat item.
-    int where                          ///< Location to be retrieved.
+    psS32 where                          ///< Location to be retrieved.
 );
 
@@ -213,7 +213,7 @@
  * @return void: void.
  */
-bool psMetadataSetIterator(
+psBool psMetadataSetIterator(
     psMetadata* restrict md,           ///< Metadata collection to iterate.
-    int where                          ///< Location of iterator.
+    psS32 where                          ///< Location of iterator.
 );
 
@@ -227,5 +227,5 @@
     psMetadata* restrict md,           ///< Metadata collection to iterate.
     const char *restrict match,        ///< Beginning of key name.
-    int which                          ///< Iterator to be used.
+    psS32 which                          ///< Iterator to be used.
 );
 
@@ -239,5 +239,5 @@
     psMetadata* restrict md,           ///< Metadata collection to iterate.
     const char *restrict match,        ///< Beginning of key name.
-    int which                          ///< Iterator to be used.
+    psS32 which                          ///< Iterator to be used.
 );