Index: trunk/psLib/src/collections/psMetadata.h =================================================================== --- trunk/psLib/src/collections/psMetadata.h (revision 4243) +++ trunk/psLib/src/collections/psMetadata.h (revision 4321) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.48 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-14 02:54:06 $ +* @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-20 22:42:29 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -214,5 +214,5 @@ const char* name, ///< Name of metadata item. const char* comment, ///< Comment for metadata item. - psBool value ///< the value of the metadata item. + bool value ///< the value of the metadata item. ); @@ -257,5 +257,5 @@ * @return bool: True for success, false for failure. */ -psBool psMetadataAddItem( +bool psMetadataAddItem( psMetadata* md, ///< Metadata collection to insert metadat item. psMetadataItem* item, ///< Metadata item to be added. @@ -270,9 +270,9 @@ * @return bool: True for success, false for failure. */ -psBool psMetadataAdd( +bool psMetadataAdd( psMetadata* md, ///< Metadata collection to insert metadata item. - psS32 location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL + int location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char *name, ///< Name of metadata item. - int type, ///< Type of metadata item (psMetadataType) and options (psMetadataFlags) + int format, ///< Type of metadata item (psMetadataType) and options (psMetadataFlags) const char *comment, ///< Comment for metadata item. ... ///< Arguments for name formatting and metadata item data. @@ -286,9 +286,9 @@ * @return bool: True for success, false for failure. */ -psBool psMetadataAddV( +bool psMetadataAddV( psMetadata* md, ///< Metadata collection to insert metadata item. - psS32 location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL + int location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char *name, ///< Name of metadata item. - int type, ///< Type of metadata item (psMetadataType) and options (psMetadataFlags) + int format, ///< Type of metadata item (psMetadataType) and options (psMetadataFlags) const char *comment, ///< Comment for metadata item. va_list list ///< Arguments for name formatting and metadata item data. @@ -300,5 +300,5 @@ * @return psBool: True for success, False for failure. */ -psBool psMetadataAddS32( +bool psMetadataAddS32( psMetadata* md, ///< Metadata collection to insert metadata item psS32 location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL @@ -312,5 +312,5 @@ * @return psBool: True for success, False for failure. */ -psBool psMetadataAddF32( +bool psMetadataAddF32( psMetadata* md, ///< Metadata collection to insert metadata item psS32 location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL @@ -324,5 +324,5 @@ * @return psBool: True for success, False for failure. */ -psBool psMetadataAddF64( +bool psMetadataAddF64( psMetadata* md, ///< Metadata collection to insert metadata item psS32 location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL @@ -348,5 +348,5 @@ * @return psBool: True for success, False for failure. */ -psBool psMetadataAddStr( +bool psMetadataAddStr( psMetadata* md, ///< Metadata collection to insert metadata item psS32 location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL @@ -438,8 +438,8 @@ * @return bool: True for success, false for failure. */ -psBool psMetadataRemove( - psMetadata* md, ///< Metadata collection to remove metadata item. - psS32 where, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL - const char * key ///< Name of metadata key. +bool psMetadataRemove( + psMetadata* md, ///< Metadata collection to remove metadata item. + int location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL + const char * key ///< Name of metadata key. ); @@ -453,5 +453,5 @@ */ psMetadataItem* psMetadataLookup( - psMetadata * md, ///< Metadata collection to lookup metadata item. + const psMetadata * md, ///< Metadata collection to lookup metadata item. const char * key ///< Name of metadata key. ); @@ -466,6 +466,6 @@ */ psF64 psMetadataLookupF64( - psBool *status, ///< Status of lookup. - psMetadata *md, ///< Metadata collection to lookup metadata item. + bool *status, ///< Status of lookup. + const psMetadata *md, ///< Metadata collection to lookup metadata item. const char *key ///< Name of metadata key. ); @@ -480,6 +480,6 @@ */ psF32 psMetadataLookupF32( - psBool *status, ///< Status of lookup. - psMetadata *md, ///< Metadata collection to lookup metadata item. + bool *status, ///< Status of lookup. + const psMetadata *md, ///< Metadata collection to lookup metadata item. const char *key ///< Name of metadata key. ); @@ -494,6 +494,6 @@ */ psS32 psMetadataLookupS32( - psBool *status, ///< Status of lookup. - psMetadata *md, ///< Metadata collection to lookup metadata item. + bool *status, ///< Status of lookup. + const psMetadata *md, ///< Metadata collection to lookup metadata item. const char *key ///< Name of metadata key. ); @@ -508,6 +508,6 @@ */ psBool psMetadataLookupBool( - psBool *status, ///< Status of lookup. - psMetadata *md, ///< Metadata collection to lookup metadata item. + bool *status, ///< Status of lookup. + const psMetadata *md, ///< Metadata collection to lookup metadata item. const char *key ///< Name of metadata key. ); @@ -522,6 +522,6 @@ */ psPtr psMetadataLookupPtr( - psBool *status, ///< Status of lookup. - psMetadata* md, ///< Metadata collection to lookup metadata item. + bool *status, ///< Status of lookup. + const psMetadata* md, ///< Metadata collection to lookup metadata item. const char *key ///< Name of metadata key. ); @@ -560,5 +560,5 @@ * @return psBool TRUE if iterator successfully set, otherwise FALSE. */ -psBool psMetadataIteratorSet( +bool psMetadataIteratorSet( psMetadataIterator* iterator, ///< psMetadata iterator int location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL