Index: trunk/psLib/src/collections/psList.h =================================================================== --- trunk/psLib/src/collections/psList.h (revision 4321) +++ trunk/psLib/src/collections/psList.h (revision 4330) @@ -7,6 +7,6 @@ * @ingroup LinkedList * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 03:13:02 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -107,5 +107,5 @@ * iterator position is not changed. * - * @return psBool TRUE if iterator successfully set, otherwise FALSE. + * @return bool TRUE if iterator successfully set, otherwise FALSE. */ bool psListIteratorSet( @@ -116,5 +116,5 @@ /** Adds an element to a psList at position given. * - * @return psBool TRUE if item was successfully added, otherwise FALSE. + * @return bool TRUE if item was successfully added, otherwise FALSE. */ bool psListAdd( @@ -126,5 +126,5 @@ /** Adds an data item to a psList at position just after the list position given * - * @return psBool TRUE if item was successfully added, otherwise FALSE. + * @return bool TRUE if item was successfully added, otherwise FALSE. */ bool psListAddAfter( @@ -135,5 +135,5 @@ /** Adds an data item to a psList at position just before the list position given * - * @return psBool TRUE if item was successfully added, otherwise FALSE. + * @return bool TRUE if item was successfully added, otherwise FALSE. */ bool psListAddBefore( @@ -144,5 +144,5 @@ /** Remove an item at the specified location from a list. * - * @return psBool TRUE if element is successfully removed, otherwise FALSE. + * @return bool TRUE if element is successfully removed, otherwise FALSE. */ bool psListRemove( @@ -153,5 +153,5 @@ /** Remove an item from a list. * - * @return psBool TRUE if element is successfully removed, otherwise FALSE. + * @return bool TRUE if element is successfully removed, otherwise FALSE. */ bool psListRemoveData( Index: trunk/psLib/src/collections/psMetadata.h =================================================================== --- trunk/psLib/src/collections/psMetadata.h (revision 4321) +++ trunk/psLib/src/collections/psMetadata.h (revision 4330) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-20 22:42:29 $ +* @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -274,5 +274,5 @@ int location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char *name, ///< Name of metadata item. - int format, ///< 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. @@ -298,5 +298,5 @@ /** Add a psS32 value to metadata collection. * - * @return psBool: True for success, False for failure. + * @return bool: True for success, False for failure. */ bool psMetadataAddS32( @@ -310,5 +310,5 @@ /** Add a psF32 value to metadata collection. * - * @return psBool: True for success, False for failure. + * @return bool: True for success, False for failure. */ bool psMetadataAddF32( @@ -322,5 +322,5 @@ /** Add a psF64 value to metadata collection. * - * @return psBool: True for success, False for failure. + * @return bool: True for success, False for failure. */ bool psMetadataAddF64( @@ -346,5 +346,5 @@ /** Add a string to metadata collection. * - * @return psBool: True for success, False for failure. + * @return bool: True for success, False for failure. */ bool psMetadataAddStr( @@ -505,7 +505,7 @@ * returned. * - * @return psBool : Value of metadata item. - */ -psBool psMetadataLookupBool( + * @return bool : Value of metadata item. + */ +bool psMetadataLookupBool( bool *status, ///< Status of lookup. const psMetadata *md, ///< Metadata collection to lookup metadata item. @@ -558,5 +558,5 @@ * invalid the iterator position is not changed. * - * @return psBool TRUE if iterator successfully set, otherwise FALSE. + * @return bool TRUE if iterator successfully set, otherwise FALSE. */ bool psMetadataIteratorSet( Index: trunk/psLib/src/collections/psScalar.c =================================================================== --- trunk/psLib/src/collections/psScalar.c (revision 4321) +++ trunk/psLib/src/collections/psScalar.c (revision 4330) @@ -8,6 +8,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -80,10 +80,10 @@ } -psScalar* psScalarCopy(psScalar *scalar) +psScalar* psScalarCopy(const psScalar *value) { psElemType dataType; psScalar *newScalar = NULL; - if (scalar == NULL) { + if (value == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psScalar_COPY_NULL); @@ -91,41 +91,41 @@ } - dataType = scalar->type.type; + dataType = value->type.type; switch (dataType) { case PS_TYPE_S8: - newScalar = psScalarAlloc(scalar->data.S8, dataType); + newScalar = psScalarAlloc(value->data.S8, dataType); break; case PS_TYPE_U8: - newScalar = psScalarAlloc(scalar->data.U8, dataType); + newScalar = psScalarAlloc(value->data.U8, dataType); break; case PS_TYPE_S16: - newScalar = psScalarAlloc(scalar->data.S16, dataType); + newScalar = psScalarAlloc(value->data.S16, dataType); break; case PS_TYPE_U16: - newScalar = psScalarAlloc(scalar->data.U16, dataType); + newScalar = psScalarAlloc(value->data.U16, dataType); break; case PS_TYPE_S32: - newScalar = psScalarAlloc(scalar->data.S32, dataType); + newScalar = psScalarAlloc(value->data.S32, dataType); break; case PS_TYPE_U32: - newScalar = psScalarAlloc(scalar->data.U32, dataType); + newScalar = psScalarAlloc(value->data.U32, dataType); break; case PS_TYPE_S64: - newScalar = psScalarAlloc(scalar->data.S64, dataType); + newScalar = psScalarAlloc(value->data.S64, dataType); break; case PS_TYPE_U64: - newScalar = psScalarAlloc(scalar->data.U64, dataType); + newScalar = psScalarAlloc(value->data.U64, dataType); break; case PS_TYPE_F32: - newScalar = psScalarAlloc(scalar->data.F32, dataType); + newScalar = psScalarAlloc(value->data.F32, dataType); break; case PS_TYPE_F64: - newScalar = psScalarAlloc(scalar->data.F64, dataType); + newScalar = psScalarAlloc(value->data.F64, dataType); break; case PS_TYPE_C32: - newScalar = psScalarAlloc(scalar->data.C32, dataType); + newScalar = psScalarAlloc(value->data.C32, dataType); break; case PS_TYPE_C64: - newScalar = psScalarAlloc(scalar->data.C64, dataType); + newScalar = psScalarAlloc(value->data.C64, dataType); break; default: Index: trunk/psLib/src/collections/psScalar.h =================================================================== --- trunk/psLib/src/collections/psScalar.h (revision 4321) +++ trunk/psLib/src/collections/psScalar.h (revision 4330) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -77,5 +77,5 @@ */ psScalar* psScalarCopy( - psScalar *scalar ///< Scalar to copy. + const psScalar *value ///< Scalar to copy. ); Index: trunk/psLib/src/collections/psVector.c =================================================================== --- trunk/psLib/src/collections/psVector.c (revision 4321) +++ trunk/psLib/src/collections/psVector.c (revision 4330) @@ -9,6 +9,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-10 21:46:46 $ +* @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -129,5 +129,5 @@ } -psVector *psVectorExtend(psVector *vector, int delta, int nExtend) +psVector *psVectorExtend(psVector *vector, long delta, long nExtend) { // can't handle a NULL vector (don't know the data type to allocate) @@ -166,20 +166,20 @@ } -psVector* psVectorCopy(psVector* out, const psVector* in, psElemType type) -{ - if (in == NULL) { +psVector* psVectorCopy(psVector* output, const psVector* input, psElemType type) +{ + if (input == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psVector_SORT_NULL); - psFree(out); - return NULL; - } - - psS32 nElements = in->n; - - out = psVectorRecycle(out, nElements, type); + psFree(output); + return NULL; + } + + psS32 nElements = input->n; + + output = psVectorRecycle(output, nElements, type); #define PSVECTOR_COPY(INTYPE,OUTTYPE) { \ - ps##INTYPE *inVec = in->data.INTYPE; \ - ps##OUTTYPE *outVec = out->data.OUTTYPE; \ + ps##INTYPE *inVec = input->data.INTYPE; \ + ps##OUTTYPE *outVec = output->data.OUTTYPE; \ for (psS32 col=0;coltype.type) { \ + switch (input->type.type) { \ case PS_TYPE_S8: \ PSVECTOR_COPY(S8,OUTTYPE); \ @@ -232,5 +232,5 @@ PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, \ typeStr); \ - psFree(out); \ + psFree(output); \ } \ } \ @@ -257,10 +257,10 @@ PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, typeStr); - psFree(out); + psFree(output); break; } } - return out; + return output; Index: trunk/psLib/src/collections/psVector.h =================================================================== --- trunk/psLib/src/collections/psVector.h (revision 4321) +++ trunk/psLib/src/collections/psVector.h (revision 4330) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-10 21:46:46 $ + * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -101,6 +101,6 @@ psVector *psVectorExtend( psVector *vector, ///< Vector to extend - int delta, ///< Amount to expand allocation, if necessary - int nExtend ///< Number of elements to add to vector length + long delta, ///< Amount to expand allocation, if necessary + long nExtend ///< Number of elements to add to vector length ); @@ -132,6 +132,6 @@ */ psVector* psVectorCopy( - psVector* out, ///< if non-NULL, a psVector to recycle - const psVector* in, ///< the vector to copy. + psVector* output, ///< if non-NULL, a psVector to recycle + const psVector* input, ///< the vector to copy. psElemType type ///< the data type of the resulting psVector );