Index: trunk/psLib/src/collections/psArray.c =================================================================== --- trunk/psLib/src/collections/psArray.c (revision 1432) +++ trunk/psLib/src/collections/psArray.c (revision 1440) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -32,5 +32,5 @@ /*****************************************************************************/ -static void arrayFree(psArray * restrict psArr); +static void arrayFree(psArray* restrict psArr); /*****************************************************************************/ @@ -39,7 +39,7 @@ /*****************************************************************************/ -psArray *psArrayAlloc(unsigned int nalloc) +psArray* psArrayAlloc(unsigned int nalloc) { - psArray *psArr = NULL; + psArray* psArr = NULL; // Invalid nalloc @@ -49,5 +49,5 @@ } // Create vector struct - psArr = (psArray *) psAlloc(sizeof(psArray)); + psArr = (psArray* ) psAlloc(sizeof(psArray)); p_psMemSetDeallocator(psArr, (psFreeFcn) arrayFree); @@ -61,5 +61,5 @@ } -psArray *psArrayRealloc(unsigned int nalloc, psArray * restrict in) +psArray* psArrayRealloc(unsigned int nalloc, psArray* restrict in) { // Invalid nalloc @@ -87,5 +87,5 @@ } -static void arrayFree(psArray * restrict psArr) +static void arrayFree(psArray* restrict psArr) { if (psArr == NULL) { @@ -98,5 +98,5 @@ } -void psArrayElementFree(psArray * restrict psArr) +void psArrayElementFree(psArray* restrict psArr) { @@ -111,5 +111,5 @@ } -psArray *psArraySort(psArray * in, psComparePtrFcn compare) +psArray* psArraySort(psArray* in, psComparePtrFcn compare) { if (in == NULL) { Index: trunk/psLib/src/collections/psArray.h =================================================================== --- trunk/psLib/src/collections/psArray.h (revision 1432) +++ trunk/psLib/src/collections/psArray.h (revision 1440) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -36,5 +36,5 @@ unsigned int nalloc; ///< Total number of elements available. unsigned int n; ///< Number of elements in use. - psPTR *data; ///< An Array of pointer elements + psPTR* data; ///< An Array of pointer elements } psArray; @@ -51,8 +51,8 @@ * data * - * @return psArray*: Pointer to psArray. + * @return psArray* : Pointer to psArray. * */ -psArray *psArrayAlloc(unsigned int nalloc ///< Total number of elements to make available. +psArray* psArrayAlloc(unsigned int nalloc ///< Total number of elements to make available. ); @@ -62,9 +62,9 @@ * of data. * - * @return psArray*: Pointer to psArray. + * @return psArray* : Pointer to psArray. * */ -psArray *psArrayRealloc(unsigned int nalloc, ///< Total number of elements to make available. - psArray * restrict psArr ///< array to reallocate. +psArray* psArrayRealloc(unsigned int nalloc, ///< Total number of elements to make available. + psArray* restrict psArr ///< array to reallocate. ); @@ -76,5 +76,5 @@ * */ -void psArrayElementFree(psArray * restrict psArr ///< Void pointer array to destroy. +void psArrayElementFree(psArray* restrict psArr ///< Void pointer array to destroy. ); @@ -84,7 +84,7 @@ * to specify how the objects on the array should be sorted. * - * @return psArray* The sorted array. + * @return psArray* The sorted array. */ -psArray *psArraySort(psArray * in, psComparePtrFcn compare); +psArray* psArraySort(psArray* in, psComparePtrFcn compare); /// @} Index: trunk/psLib/src/collections/psBitSet.c =================================================================== --- trunk/psLib/src/collections/psBitSet.c (revision 1432) +++ trunk/psLib/src/collections/psBitSet.c (revision 1440) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -70,5 +70,5 @@ /*****************************************************************************/ -static void psBitSetFree(psBitSet * restrict inBitSet); +static void psBitSetFree(psBitSet* restrict inBitSet); /** Private function to create a mask. @@ -95,8 +95,8 @@ /*****************************************************************************/ -psBitSet *psBitSetAlloc(int n) +psBitSet* psBitSetAlloc(int n) { int numBytes = 0; - psBitSet *newObj = NULL; + psBitSet* newObj = NULL; if (n <= 0) { @@ -125,5 +125,5 @@ } -static void psBitSetFree(psBitSet * restrict inBitSet) +static void psBitSetFree(psBitSet* restrict inBitSet) { if (inBitSet == NULL) { @@ -134,5 +134,5 @@ } -psBitSet *psBitSetSet(psBitSet * inBitSet, int bit) +psBitSet* psBitSetSet(psBitSet* inBitSet, int bit) { char *byte = NULL; @@ -155,5 +155,5 @@ } -bool psBitSetTest(const psBitSet * inBitSet, int bit) +bool psBitSetTest(const psBitSet* inBitSet, int bit) { char *byte = NULL; @@ -178,6 +178,6 @@ } -psBitSet *psBitSetOp(psBitSet * outBitSet, const psBitSet * restrict inBitSet1, char *operator, - const psBitSet * restrict inBitSet2) +psBitSet* psBitSetOp(psBitSet* outBitSet, const psBitSet* restrict inBitSet1, char *operator, + const psBitSet* restrict inBitSet2) { int i = 0; @@ -241,5 +241,5 @@ } -psBitSet *psBitSetNot(psBitSet * outBitSet, const psBitSet * restrict inBitSet) +psBitSet* psBitSetNot(psBitSet* outBitSet, const psBitSet* restrict inBitSet) { int i = 0; @@ -278,5 +278,5 @@ } -char *psBitSetToString(const psBitSet * restrict inBitSet) +char *psBitSetToString(const psBitSet* restrict inBitSet) { int i = 0; Index: trunk/psLib/src/collections/psBitSet.h =================================================================== --- trunk/psLib/src/collections/psBitSet.h (revision 1432) +++ trunk/psLib/src/collections/psBitSet.h (revision 1440) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -56,10 +56,10 @@ * allocation. * - * @return psBitSet*: Pointer to struct containing array of bits and size of array. + * @return psBitSet* : Pointer to struct containing array of bits and size of array. */ /*@null@*/ -psBitSet *psBitSetAlloc(int n +psBitSet* psBitSetAlloc(int n /**< Number of bits in psBitSet array */ ); @@ -71,9 +71,9 @@ * an array with two elements would result in an psBitSet that looks like 00000000 00001000. * - * @return psBitSet*: Pointer to struct containing psBitSet. + * @return psBitSet* : Pointer to struct containing psBitSet. */ -psBitSet *psBitSetSet( +psBitSet* psBitSetSet( - /* @returned@ */ psBitSet * restrict inMask, + /* @returned@ */ psBitSet* restrict inMask, /**< Pointer to psBitSet to be set. */ @@ -91,5 +91,5 @@ */ -bool psBitSetTest(const psBitSet * restrict inMask, +bool psBitSetTest(const psBitSet* restrict inMask, /**< Pointer psBitSet to be tested. */ @@ -102,17 +102,17 @@ * be performed and an error message will be logged. * - * @return psBitSet*: Pointer to struct containing result of binary operation. + * @return psBitSet* : Pointer to struct containing result of binary operation. */ -psBitSet *psBitSetOp( +psBitSet* psBitSetOp( - /* @returned@ */ psBitSet * restrict outMask, + /* @returned@ */ psBitSet* restrict outMask, /**< Resulting psBitSet from binary operation */ - const psBitSet * restrict inMask1, + const psBitSet* restrict inMask1, /**< First psBitSet on which to operate */ char *operator, /**< Bit operation */ - const psBitSet * restrict inMask2 + const psBitSet* restrict inMask2 /**< First psBitSet on which to operate */ ); @@ -122,11 +122,11 @@ * Toggles bits in a psBitset. All zero bits are set to one and all one bits are set to zero. * - * @return psBitSet*: Pointer to struct containing result of operation. + * @return psBitSet* : Pointer to struct containing result of operation. */ -psBitSet *psBitSetNot(psBitSet * outBitSet, +psBitSet* psBitSetNot(psBitSet* outBitSet, /**< Resulting psBitSet from operation */ - const psBitSet * restrict inBitSet + const psBitSet* restrict inBitSet /**< Input psBitSet */ ); @@ -140,5 +140,5 @@ */ -char *psBitSetToString(const psBitSet * restrict inMask +char *psBitSetToString(const psBitSet* restrict inMask /**< psBitSet to convert */ ); Index: trunk/psLib/src/collections/psHash.c =================================================================== --- trunk/psLib/src/collections/psHash.c (revision 1432) +++ trunk/psLib/src/collections/psHash.c (revision 1440) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 20:29:43 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -26,9 +26,9 @@ #include "psAbort.h" -static psHashBucket *hashBucketAlloc(const char *key, void *data, psHashBucket * next); -static void hashBucketFree(psHashBucket * bucket); -static void *doHashWork(psHash * table, const char *key, void *data, bool remove +static psHashBucket* hashBucketAlloc(const char *key, void *data, psHashBucket* next); +static void hashBucketFree(psHashBucket* bucket); +static void *doHashWork(psHash* table, const char *key, void *data, bool remove ); -static void hashFree(psHash * table); +static void hashFree(psHash* table); /****************************************************************************** @@ -40,9 +40,9 @@ The linked list *****************************************************************************/ -psList *psHashKeyList(psHash * table) +psList* psHashKeyList(psHash* table) { int i = 0; // Loop index variable - psList *myLinkList = NULL; // The output data structure - psHashBucket *ptr = NULL; // Used to step thru linked list. + psList* myLinkList = NULL; // The output data structure + psHashBucket* ptr = NULL; // Used to step thru linked list. if (table == NULL) { @@ -81,5 +81,5 @@ the new hash bucket. *****************************************************************************/ -static psHashBucket *hashBucketAlloc(const char *key, void *data, psHashBucket * next) +static psHashBucket* hashBucketAlloc(const char *key, void *data, psHashBucket* next) { if (key == NULL) { @@ -87,5 +87,5 @@ } // Allocate memory for the new hash bucket. - psHashBucket *bucket = psAlloc(sizeof(psHashBucket)); + psHashBucket* bucket = psAlloc(sizeof(psHashBucket)); p_psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree); @@ -114,5 +114,5 @@ NONE *****************************************************************************/ -static void hashBucketFree(psHashBucket * bucket) +static void hashBucketFree(psHashBucket* bucket) { if (bucket == NULL) { @@ -133,15 +133,15 @@ The new hash table. *****************************************************************************/ -psHash *psHashAlloc(int nbucket) // initial number of buckets +psHash* psHashAlloc(int nbucket) // initial number of buckets { int i = 0; // loop index variable // Create the new hash table. - psHash *table = psAlloc(sizeof(psHash)); + psHash* table = psAlloc(sizeof(psHash)); p_psMemSetDeallocator(table, (psFreeFcn) hashFree); // Allocate memory for the buckets. - table->buckets = psAlloc(nbucket * sizeof(psHashBucket *)); + table->buckets = psAlloc(nbucket * sizeof(psHashBucket* )); table->nbucket = nbucket; @@ -168,5 +168,5 @@ NONE *****************************************************************************/ -static void hashFree(psHash * table) +static void hashFree(psHash* table) { int i = 0; // Loop index variable. @@ -210,5 +210,5 @@ there is little common code between those functions. *****************************************************************************/ -static void *doHashWork(psHash * table, const char *key, void *data, bool remove +static void *doHashWork(psHash* table, const char *key, void *data, bool remove ) { @@ -217,6 +217,6 @@ // "hashed" from the key. char *tmpchar = NULL; // Used in computing the hash function. - psHashBucket *ptr = NULL; // Used to retrieve the hash bucket. - psHashBucket *optr = NULL; // "original pointer": used to step + psHashBucket* ptr = NULL; // Used to retrieve the hash bucket. + psHashBucket* optr = NULL; // "original pointer": used to step // thru the linked list for a bucket. @@ -338,5 +338,5 @@ boolean value defining success or failure *****************************************************************************/ -bool psHashAdd(psHash * table, const char *key, void *data) +bool psHashAdd(psHash* table, const char *key, void *data) { if (table == NULL) { @@ -364,5 +364,5 @@ The data associated with that key. *****************************************************************************/ -void *psHashLookup(psHash * table, // table to lookup key in +void *psHashLookup(psHash* table, // table to lookup key in const char *key) // key to lookup { @@ -387,5 +387,5 @@ boolean value defining success or failure *****************************************************************************/ -bool psHashRemove(psHash * table, const char *key) +bool psHashRemove(psHash* table, const char *key) { void *data = NULL; Index: trunk/psLib/src/collections/psHash.h =================================================================== --- trunk/psLib/src/collections/psHash.h (revision 1432) +++ trunk/psLib/src/collections/psHash.h (revision 1440) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -31,5 +31,5 @@ char *key; ///< key for this item of data void *data; ///< the data itself - struct psHashBucket *next; ///< list of other possible keys + struct psHashBucket* next; ///< list of other possible keys } psHashBucket; @@ -41,14 +41,14 @@ { int nbucket; ///< Number of buckets in hash table. - psHashBucket **buckets; ///< The bucket data. + psHashBucket* *buckets; ///< The bucket data. } psHash; /// Allocate hash buckets in table. -psHash *psHashAlloc(int nbucket ///< The number of buckets to allocate. +psHash* psHashAlloc(int nbucket ///< The number of buckets to allocate. ); /// Insert entry into table. -bool psHashAdd(psHash * table, ///< table to insert in +bool psHashAdd(psHash* table, ///< table to insert in const char *key, ///< key to use void *data ///< data to insert @@ -56,15 +56,15 @@ /// Lookup key in table. -void *psHashLookup(psHash * table, ///< table to lookup key in +void *psHashLookup(psHash* table, ///< table to lookup key in const char *key ///< key to lookup ); /// Remove key from table. -bool psHashRemove(psHash * table, ///< table to lookup key in +bool psHashRemove(psHash* table, ///< table to lookup key in const char *key ///< key to lookup ); /// List all keys in table. -psList *psHashKeyList(psHash * table ///< table to list keys from. +psList* psHashKeyList(psHash* table ///< table to list keys from. ); Index: trunk/psLib/src/collections/psList.c =================================================================== --- trunk/psLib/src/collections/psList.c (revision 1432) +++ trunk/psLib/src/collections/psList.c (revision 1440) @@ -7,6 +7,6 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -29,12 +29,12 @@ // private functions. -static psListElem *listGetIterator(psList * list); -static int listGetIteratorIndex(psList * list); -static void listSetIterator(psList * list, int where, bool lockList); -static void listFree(psList * list); - -psList *psListAlloc(void *data) -{ - psList *list = psAlloc(sizeof(psList)); +static psListElem* listGetIterator(psList* list); +static int listGetIteratorIndex(psList* list); +static void listSetIterator(psList* list, int where, bool lockList); +static void listFree(psList* list); + +psList* psListAlloc(void *data) +{ + psList* list = psAlloc(sizeof(psList)); p_psMemSetDeallocator(list, (psFreeFcn) listFree); @@ -55,5 +55,5 @@ } -static void listFree(psList * list) +static void listFree(psList* list) { if (list == NULL) { @@ -64,6 +64,6 @@ ; - for (psListElem * ptr = list->head; ptr != NULL;) { - psListElem *next = ptr->next; + for (psListElem* ptr = list->head; ptr != NULL;) { + psListElem* next = ptr->next; psFree(ptr->data); @@ -81,8 +81,8 @@ } -bool psListAdd(psList * list, void *data, int where) -{ - psListElem *position; - psListElem *elem; +bool psListAdd(psList* list, void *data, int where) +{ + psListElem* position; + psListElem* elem; int cursorIndex = 0; @@ -168,7 +168,7 @@ * Remove an element from a list */ -bool psListRemove(psList * list, void *data, int which) -{ - psListElem *elem = NULL; // element to remove +bool psListRemove(psList* list, void *data, int which) +{ + psListElem* elem = NULL; // element to remove int cursorIndex = 0; @@ -186,5 +186,5 @@ int i = 0; // index - for (psListElem * ptr = list->head; ptr != NULL; ptr = ptr->next) { + for (psListElem* ptr = list->head; ptr != NULL; ptr = ptr->next) { if (ptr->data == data) { which = i; @@ -243,12 +243,12 @@ } -void psListSetIterator(psList * list, int where) +void psListSetIterator(psList* list, int where) { listSetIterator(list, where, true); } -void listSetIterator(psList * list, int where, bool lockList) -{ - psListElem *cursor; +void listSetIterator(psList* list, int where, bool lockList) +{ + psListElem* cursor; int position; @@ -340,5 +340,5 @@ } -psListElem *listGetIterator(psList * list) +psListElem* listGetIterator(psList* list) { if (list == NULL) { @@ -355,5 +355,5 @@ } -int listGetIteratorIndex(psList * list) +int listGetIteratorIndex(psList* list) { if (list->iter == ITER_INIT_HEAD) { @@ -366,7 +366,7 @@ } -void *psListGet(psList * list, int which) -{ - psListElem *element; +void *psListGet(psList* list, int which) +{ + psListElem* element; psListSetIterator(list, which); @@ -383,15 +383,15 @@ * and now return the previous/next element of the list */ -void *psListGetNext(psList * list) +void *psListGetNext(psList* list) { return psListGet(list, PS_LIST_NEXT); } -void *psListGetPrevious(psList * list) +void *psListGetPrevious(psList* list) { return psListGet(list, PS_LIST_PREVIOUS); } -void *psListGetCurrent(psList * list) +void *psListGetCurrent(psList* list) { return psListGet(list, PS_LIST_CURRENT); @@ -401,9 +401,9 @@ * Convert a psList to/from a psVoidPtrArray */ -psArray *psListToArray(psList * restrict list) -{ - psListElem *ptr; +psArray* psListToArray(psList* restrict list) +{ + psListElem* ptr; unsigned int n; - psArray *restrict arr; + psArray* restrict arr; if (list == NULL) { @@ -429,8 +429,8 @@ } -psList *psArrayToList(psArray * arr) +psList* psArrayToList(psArray* arr) { unsigned int n; - psList *list; // list of elements + psList* list; // list of elements if (arr == NULL) { @@ -447,7 +447,7 @@ } -psList *psListSort(psList * list, psComparePtrFcn compare) -{ - psArray *arr; +psList* psListSort(psList* list, psComparePtrFcn compare) +{ + psArray* arr; if (list == NULL) { Index: trunk/psLib/src/collections/psList.h =================================================================== --- trunk/psLib/src/collections/psList.h (revision 1432) +++ trunk/psLib/src/collections/psList.h (revision 1440) @@ -10,6 +10,6 @@ * @ingroup LinkedList * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -44,6 +44,6 @@ typedef struct psListElem { - struct psListElem *prev; ///< previous link in list - struct psListElem *next; ///< next link in list + struct psListElem* prev; ///< previous link in list + struct psListElem* next; ///< next link in list void *data; ///< real data item } @@ -58,7 +58,7 @@ { unsigned int size; ///< number of elements on list - psListElem *head; ///< first element on list (may be NULL) - psListElem *tail; ///< last element on list (may be NULL) - psListElem *iter; ///< iteration cursor + psListElem* head; ///< first element on list (may be NULL) + psListElem* tail; ///< last element on list (may be NULL) + psListElem* iter; ///< iteration cursor unsigned int iterIndex; ///< the numeric position of the iteration cursor in the list pthread_mutex_t lock; ///< mutex to lock a node during changes @@ -68,7 +68,7 @@ /** Creates a psList linked list object. * - * @return psList* A new psList object. + * @return psList* A new psList object. */ -psList *psListAlloc(void *data +psList* psListAlloc(void *data ///< initial data item; may be NULL if no an empty psList is desired ) @@ -77,8 +77,8 @@ /** Adds an element to a psList at position given. * - * @return psList* The psList with added data item. If list parameter is + * @return psList* The psList with added data item. If list parameter is * NULL, the return value will also be NULL. */ -bool psListAdd(psList * restrict list, ///< list to add to (if NULL, nothing is done) +bool psListAdd(psList* restrict list, ///< list to add to (if NULL, nothing is done) void *data, ///< data item to add. If NULL, list is not modified. int where ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location. @@ -89,5 +89,5 @@ * @return bool TRUE if element is successfully removed, otherwise FALSE. */ -bool psListRemove(psList * restrict list, +bool psListRemove(psList* restrict list, ///< list to remove element from void *data, @@ -104,5 +104,5 @@ * NULL is returned. */ -void *psListGet(psList * restrict list, ///< list to retrieve element from +void *psListGet(psList* restrict list, ///< list to retrieve element from int which ///< index number, or PS_LIST_NEXT, PS_LIST_PREV, PS_LIST_UNKNOWN ); @@ -112,5 +112,5 @@ * */ -void psListSetIterator(psList * restrict list, ///< list to retrieve element from +void psListSetIterator(psList* restrict list, ///< list to retrieve element from int where ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL ); @@ -123,5 +123,5 @@ * parameter was NULL. */ -void *psListGetNext(psList * restrict list ///< list to retrieve element from +void *psListGetNext(psList* restrict list ///< list to retrieve element from ); @@ -133,5 +133,5 @@ * iterator is not valid or list parameter was NULL. */ -void *psListGetCurrent(psList * restrict list ///< list to retrieve element from +void *psListGetCurrent(psList* restrict list ///< list to retrieve element from ); @@ -143,24 +143,24 @@ * parameter was NULL. */ -void *psListGetPrevious(psList * restrict list ///< list to retrieve element from +void *psListGetPrevious(psList* restrict list ///< list to retrieve element from ); /** Convert a linked list to an array * - * @return psArray* A new psArray populated with elements from the list, + * @return psArray* A new psArray populated with elements from the list, * or NULL if the given dlist parameter is NULL. */ -psArray *psListToArray(psList * dlist ///< List to convert +psArray* psListToArray(psList* dlist ///< List to convert ); /** Convert array to a doubly-linked list * - * @return psList* A new psList populated with elements formt the psArray, + * @return psList* A new psList populated with elements formt the psArray, * or NULL is the given arr parameter is NULL. */ -psList *psArrayToList(psArray * arr ///< vector to convert +psList* psArrayToList(psArray* arr ///< vector to convert ); -psList *psListSort(psList * list, psComparePtrFcn compare); +psList* psListSort(psList* list, psComparePtrFcn compare); /// @} End of DataGroup Functions Index: trunk/psLib/src/collections/psMetadata.c =================================================================== --- trunk/psLib/src/collections/psMetadata.c (revision 1432) +++ trunk/psLib/src/collections/psMetadata.c (revision 1440) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 23:06:10 $ +* @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -88,5 +88,5 @@ /*****************************************************************************/ -static void metadataItemFree(psMetadataItem * metadataItem) +static void metadataItemFree(psMetadataItem* metadataItem) { psMetadataType type; @@ -109,5 +109,5 @@ } -static void metadataFree(psMetadata * metadata) +static void metadataFree(psMetadata* metadata) { if (metadata == NULL) { @@ -124,8 +124,8 @@ /*****************************************************************************/ -psMetadataItem *psMetadataItemAlloc(const char *name, psMetadataType type, const char *comment, ...) +psMetadataItem* psMetadataItemAlloc(const char *name, psMetadataType type, const char *comment, ...) { va_list argPtr; - psMetadataItem *metadataItem = NULL; + psMetadataItem* metadataItem = NULL; // Get the variable list parameters to pass to allocation function @@ -141,8 +141,8 @@ } -psMetadataItem *psMetadataItemAllocV(const char *name, psMetadataType type, const char *comment, +psMetadataItem* psMetadataItemAllocV(const char *name, psMetadataType type, const char *comment, va_list argPtr) { - psMetadataItem *metadataItem = NULL; + psMetadataItem* metadataItem = NULL; if (name == NULL) { @@ -151,5 +151,5 @@ } // Allocate metadata item - metadataItem = (psMetadataItem *) psAlloc(sizeof(psMetadataItem)); + metadataItem = (psMetadataItem* ) psAlloc(sizeof(psMetadataItem)); if (metadataItem == NULL) { psAbort(__func__, "Failed to allocate memory"); @@ -211,12 +211,12 @@ } -psMetadata *psMetadataAlloc(void) -{ - psList *list = NULL; - psHash *table = NULL; - psMetadata *metadata = NULL; +psMetadata* psMetadataAlloc(void) +{ + psList* list = NULL; + psHash* table = NULL; + psMetadata* metadata = NULL; // Allocate metadata - metadata = (psMetadata *) psAlloc(sizeof(psMetadata)); + metadata = (psMetadata* ) psAlloc(sizeof(psMetadata)); if (metadata == NULL) { psAbort(__func__, "Failed to allocate metadata"); @@ -226,10 +226,10 @@ // Allocate metadata's internal containers - list = (psList *) psListAlloc(NULL); + list = (psList* ) psListAlloc(NULL); if (list == NULL) { psAbort(__func__, "Failed to allocate list"); } - table = (psHash *) psHashAlloc(10); + table = (psHash* ) psHashAlloc(10); if (table == NULL) { psAbort(__func__, "Failed to allocate table"); @@ -242,10 +242,10 @@ } -bool psMetadataAddItem(psMetadata * restrict md, int where, psMetadataItem * restrict metadataItem) +bool psMetadataAddItem(psMetadata* restrict md, int where, psMetadataItem* restrict metadataItem) { char *key = NULL; - psHash *mdTable = NULL; - psList *mdList = NULL; - psMetadataItem *value = NULL; + psHash* mdTable = NULL; + psList* mdList = NULL; + psMetadataItem* value = NULL; psMetadataType type = PS_META_ITEM_SET; @@ -280,5 +280,5 @@ } // Check if key is already in table - value = (psMetadataItem *) psHashLookup(mdTable, key); + value = (psMetadataItem* ) psHashLookup(mdTable, key); if (value != NULL && type != PS_META_ITEM_SET) { @@ -316,9 +316,9 @@ } -bool psMetadataAdd(psMetadata * restrict md, int where, const char *name, psMetadataType type, +bool psMetadataAdd(psMetadata* restrict md, int where, const char *name, psMetadataType type, const char *comment, ...) { va_list argPtr; - psMetadataItem *metadataItem = NULL; + psMetadataItem* metadataItem = NULL; va_start(argPtr, comment); @@ -339,11 +339,11 @@ } -bool psMetadataRemove(psMetadata * restrict md, int where, const char *restrict key) +bool psMetadataRemove(psMetadata* restrict md, int where, const char *restrict key) { int numChildren = 0; - psList *mdList = NULL; - psHash *mdTable = NULL; - psMetadataItem *entry = NULL; - psMetadataItem *entryChild = NULL; + psList* mdList = NULL; + psHash* mdTable = NULL; + psMetadataItem* entry = NULL; + psMetadataItem* entryChild = NULL; @@ -368,5 +368,5 @@ // Remove by key name - entry = (psMetadataItem *) psHashLookup(mdTable, key); + entry = (psMetadataItem* ) psHashLookup(mdTable, key); if (entry == NULL) { psError(__func__, "Couldn't find metadata item. Name: %s", key); @@ -419,8 +419,8 @@ } -psMetadataItem *psMetadataLookup(psMetadata * restrict md, const char *restrict key) -{ - psHash *mdTable = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataLookup(psMetadata* restrict md, const char *restrict key) +{ + psHash* mdTable = NULL; + psMetadataItem* entry = NULL; @@ -441,5 +441,5 @@ } - entry = (psMetadataItem *) psHashLookup(mdTable, key); + entry = (psMetadataItem* ) psHashLookup(mdTable, key); if (entry == NULL) { psError(__func__, "Could not find metadata item. Key: %s", key); @@ -450,8 +450,8 @@ } -psMetadataItem *psMetadataGet(psMetadata * restrict md, int where) -{ - psList *mdList = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataGet(psMetadata* restrict md, int where) +{ + psList* mdList = NULL; + psMetadataItem* entry = NULL; @@ -467,5 +467,5 @@ } - entry = (psMetadataItem *) psListGet(mdList, where); + entry = (psMetadataItem* ) psListGet(mdList, where); if (entry == NULL) { psError(__func__, "Couldn't find metadata item with given index. Index: %d", where); @@ -476,7 +476,7 @@ } -bool psMetadataSetIterator(psMetadata * restrict md, int where) -{ - psList *mdList = NULL; +bool psMetadataSetIterator(psMetadata* restrict md, int where) +{ + psList* mdList = NULL; if (md == NULL) { @@ -496,8 +496,8 @@ } -psMetadataItem *psMetadataGetNext(psMetadata * restrict md, const char *restrict match, int which) -{ - psList *mdList = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataGetNext(psMetadata* restrict md, const char *restrict match, int which) +{ + psList* mdList = NULL; + psMetadataItem* entry = NULL; mdList = md->list; @@ -532,8 +532,8 @@ } -psMetadataItem *psMetadataGetPrevious(psMetadata * restrict md, const char *restrict match, int which) -{ - psList *mdList = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, const char *restrict match, int which) +{ + psList* mdList = NULL; + psMetadataItem* entry = NULL; mdList = md->list; @@ -568,5 +568,5 @@ } -void psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem * restrict metadataItem) +void psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* restrict metadataItem) { psMetadataType type; @@ -616,5 +616,5 @@ } -psMetadata *psMetadataFReadHeader(psMetadata * output, char *extName, int extNum, fitsfile * fd) +psMetadata* psMetadataFReadHeader(psMetadata* output, char *extName, int extNum, fitsfile * fd) { bool tempBool; Index: trunk/psLib/src/collections/psMetadata.h =================================================================== --- trunk/psLib/src/collections/psMetadata.h (revision 1432) +++ trunk/psLib/src/collections/psMetadata.h (revision 1440) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 22:44:25 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -66,5 +66,5 @@ } data; ///< Union for data types. char *comment; ///< Optional comment ("", not NULL). - psList *restrict items; ///< List of psMetadataItems with same name. + psList* restrict items; ///< List of psMetadataItems with same name. } psMetadataItem; @@ -78,6 +78,6 @@ typedef struct psMetadata { - psList *restrict list; - psHash *restrict table; + psList* restrict list; + psHash* restrict table; } psMetadata; @@ -100,7 +100,7 @@ * specified size and type. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataItemAlloc(const char *name, ///< Name of metadata item. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataItemAlloc(const char *name, ///< Name of metadata item. psMetadataType type, ///< Type of metadata item. const char *comment, ///< Comment for metadata item. @@ -119,7 +119,7 @@ * specified size and type. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataItemAllocV(const char *name, ///< Name of metadata item. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataItemAllocV(const char *name, ///< Name of metadata item. psMetadataType type, ///< Type of metadata item. const char *comment, ///< Comment for metadata item. @@ -132,7 +132,7 @@ * Returns an empty metadata container with fully allocated internal metadata containers. * - * @return psMetadata*: Pointer metadata. - */ -psMetadata *psMetadataAlloc(void ///< Void. + * @return psMetadata* : Pointer metadata. + */ +psMetadata* psMetadataAlloc(void ///< Void. ); @@ -143,7 +143,7 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAddItem(psMetadata * restrict md, ///< Metadata collection to insert metadat item. +bool psMetadataAddItem(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where, ///< Location to be added. - psMetadataItem * restrict item ///< Metadata item to be added. + psMetadataItem* restrict item ///< Metadata item to be added. ); @@ -154,5 +154,5 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAdd(psMetadata * restrict md, ///< Metadata collection to insert metadat item. +bool psMetadataAdd(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where, ///< Location to be added. const char *name, ///< Name of metadata item. @@ -171,5 +171,5 @@ * @return bool: True for success, false for failure. */ -bool psMetadataRemove(psMetadata * restrict md, ///< Metadata collection to insert metadat item. +bool psMetadataRemove(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where, ///< Location to be removed. const char *restrict key ///< Name of metadata key. @@ -181,7 +181,7 @@ * returned. If the item is not found, null is returned. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataLookup(psMetadata * restrict md, ///< Metadata collection to insert metadat + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataLookup(psMetadata* restrict md, ///< Metadata collection to insert metadat // item. const char *restrict key ///< Name of metadata key. @@ -192,7 +192,7 @@ * Items may be found in the metadata by their entry position in the list container. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataGet(psMetadata * restrict md, ///< Metadata collection to insert metadat item. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataGet(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where ///< Location to be retrieved. ); @@ -204,5 +204,5 @@ * @return void: void. */ -bool psMetadataSetIterator(psMetadata * restrict md, ///< Metadata collection to iterate. +bool psMetadataSetIterator(psMetadata* restrict md, ///< Metadata collection to iterate. int where ///< Location of iterator. ); @@ -212,7 +212,7 @@ * Get next metadata item in iterator list. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataGetNext(psMetadata * restrict md, ///< Metadata collection to iterate. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataGetNext(psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. int which ///< Iterator to be used. @@ -223,7 +223,7 @@ * Get previous metadata item in iterator list. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataGetPrevious(psMetadata * restrict md, ///< Metadata collection to iterate. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. int which ///< Iterator to be used. @@ -238,9 +238,9 @@ * metadata type is any other data type, printing is not allowed. * - * @return psMetadataItem*: Pointer metadata item. + * @return psMetadataItem* : Pointer metadata item. */ void psMetadataItemPrint(FILE * fd, ///< Pointer to file to write metadata item. const char *format, ///< Format to print metadata item. - const psMetadataItem * restrict metadataItem ///< Metadata item to print. + const psMetadataItem* restrict metadataItem ///< Metadata item to print. ); @@ -250,7 +250,7 @@ * unimplemented. * - * @return psMetadata*: Pointer metadata. - */ -psMetadata *psMetadataReadHeader(psMetadata * output, ///< Resulting metadata from read. + * @return psMetadata* : Pointer metadata. + */ +psMetadata* psMetadataReadHeader(psMetadata* output, ///< Resulting metadata from read. char *extname, ///< File name extension string. int extnum, ///< File name extension number. Starts at 1. @@ -262,7 +262,7 @@ * Read a metadata header from file. If the file is not found, an error is reported. * - * @return psMetadata*: Pointer metadata. - */ -psMetadata *psMetadataFReadHeader(psMetadata * output, ///< Resulting metadata from read. + * @return psMetadata* : Pointer metadata. + */ +psMetadata* psMetadataFReadHeader(psMetadata* output, ///< Resulting metadata from read. char *extName, ///< File name extension string. int extNum, ///< File name extension number. Index: trunk/psLib/src/collections/psScalar.c =================================================================== --- trunk/psLib/src/collections/psScalar.c (revision 1432) +++ trunk/psLib/src/collections/psScalar.c (revision 1440) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -71,10 +71,10 @@ /*****************************************************************************/ -psScalar *psScalarAlloc(psC64 value, psElemType dataType) +psScalar* psScalarAlloc(psC64 value, psElemType dataType) { - psScalar *scalar = NULL; + psScalar* scalar = NULL; // Create scalar - scalar = (psScalar *) psAlloc(sizeof(psScalar)); + scalar = (psScalar* ) psAlloc(sizeof(psScalar)); if (scalar == NULL) { psAbort(__func__, " : Line %d - Failed to allocate memory", __LINE__); @@ -128,5 +128,5 @@ } -void psScalarFree(psScalar * restrict scalar) +void psScalarFree(psScalar* restrict scalar) { if (scalar == NULL) { Index: trunk/psLib/src/collections/psScalar.h =================================================================== --- trunk/psLib/src/collections/psScalar.h (revision 1432) +++ trunk/psLib/src/collections/psScalar.h (revision 1440) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -62,8 +62,8 @@ * Accepts a complex 64 bit float for input value, as max size, but resizes according to * correct type. - * @return psScalar*: Pointer to psScalar. + * @return psScalar* : Pointer to psScalar. * */ -psScalar *psScalarAlloc(psC64 value, ///< Data to be put into psScalar. +psScalar* psScalarAlloc(psC64 value, ///< Data to be put into psScalar. psElemType dataType ///< Type of data to be held by psScalar. ); @@ -76,5 +76,5 @@ * */ -void psScalarFree(psScalar * restrict scalar ///< Scalar to free. +void psScalarFree(psScalar* restrict scalar ///< Scalar to free. ); Index: trunk/psLib/src/collections/psVector.c =================================================================== --- trunk/psLib/src/collections/psVector.c (revision 1432) +++ trunk/psLib/src/collections/psVector.c (revision 1440) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -67,5 +67,5 @@ /*****************************************************************************/ -static void vectorFree(psVector * restrict psVec); +static void vectorFree(psVector* restrict psVec); /*****************************************************************************/ @@ -74,7 +74,7 @@ /*****************************************************************************/ -psVector *psVectorAlloc(unsigned int nalloc, psElemType elemType) -{ - psVector *psVec = NULL; +psVector* psVectorAlloc(unsigned int nalloc, psElemType elemType) +{ + psVector* psVec = NULL; int elementSize = 0; @@ -88,5 +88,5 @@ // Create vector struct - psVec = (psVector *) psAlloc(sizeof(psVector)); + psVec = (psVector* ) psAlloc(sizeof(psVector)); p_psMemSetDeallocator(psVec, (psFreeFcn) vectorFree); @@ -102,5 +102,5 @@ } -psVector *psVectorRealloc(unsigned int nalloc, psVector * restrict in) +psVector* psVectorRealloc(unsigned int nalloc, psVector* restrict in) { int elementSize = 0; @@ -130,5 +130,5 @@ } -psVector *psVectorRecycle(psVector * restrict in, unsigned int nalloc, psElemType type) +psVector* psVectorRecycle(psVector* restrict in, unsigned int nalloc, psElemType type) { psElemType elemType; @@ -160,5 +160,5 @@ } -psVector *psVectorSort(psVector * restrict outVector, const psVector * restrict inVector) +psVector* psVectorSort(psVector* restrict outVector, const psVector* restrict inVector) { int inN = 0; @@ -261,5 +261,5 @@ } -psVector *psVectorSortIndex(psVector * restrict outVector, const psVector * restrict inVector) +psVector* psVectorSortIndex(psVector* restrict outVector, const psVector* restrict inVector) { int inN = 0; @@ -270,5 +270,5 @@ int *outVec = NULL; double diff = 0.0f; - psVector *tmpVector = NULL; + psVector* tmpVector = NULL; psElemType inType = 0; @@ -348,5 +348,5 @@ } -static void vectorFree(psVector * restrict psVec) +static void vectorFree(psVector* restrict psVec) { if (psVec == NULL) { Index: trunk/psLib/src/collections/psVector.h =================================================================== --- trunk/psLib/src/collections/psVector.h (revision 1432) +++ trunk/psLib/src/collections/psVector.h (revision 1440) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -38,16 +38,16 @@ union { - psU8 *U8; ///< Unsigned 8-bit integer data. - psU16 *U16; ///< Unsigned 16-bit integer data. - psU32 *U32; ///< Unsigned 32-bit integer data. - psU64 *U64; ///< Unsigned 64-bit integer data. - psS8 *S8; ///< Signed 8-bit integer data. - psS16 *S16; ///< Signed 16-bit integer data. - psS32 *S32; ///< Signed 32-bit integer data. - psS64 *S64; ///< Signed 64-bit integer data. - psF32 *F32; ///< Single-precision float data. - psF64 *F64; ///< Double-precision float data. - psC32 *C32; ///< Single-precision complex data. - psC64 *C64; ///< Double-precision complex data. + psU8* U8; ///< Unsigned 8-bit integer data. + psU16* U16; ///< Unsigned 16-bit integer data. + psU32* U32; ///< Unsigned 32-bit integer data. + psU64* U64; ///< Unsigned 64-bit integer data. + psS8* S8; ///< Signed 8-bit integer data. + psS16* S16; ///< Signed 16-bit integer data. + psS32* S32; ///< Signed 32-bit integer data. + psS64* S64; ///< Signed 64-bit integer data. + psF32* F32; ///< Single-precision float data. + psF64* F64; ///< Double-precision float data. + psC32* C32; ///< Single-precision complex data. + psC64* C64; ///< Double-precision complex data. psPTR V; ///< Pointer to data. } data; ///< Union for data types. @@ -65,8 +65,8 @@ * Uses psLib memory allocation functions to create a vector collection of data as defined by the psType type. * - * @return psVector*: Pointer to psVector. + * @return psVector* : Pointer to psVector. * */ -psVector *psVectorAlloc(unsigned int nalloc, ///< Total number of elements to make available. +psVector* psVectorAlloc(unsigned int nalloc, ///< Total number of elements to make available. psElemType dataType ///< Type of data to be held by vector. ); @@ -77,9 +77,9 @@ * according to the psType type member contained within the vector. * - * @return psVector*: Pointer to psVector. + * @return psVector* : Pointer to psVector. * */ -psVector *psVectorRealloc(unsigned int nalloc, ///< Total number of elements to make available. - psVector * restrict psVec ///< Vector to reallocate. +psVector* psVectorRealloc(unsigned int nalloc, ///< Total number of elements to make available. + psVector* restrict psVec ///< Vector to reallocate. ); @@ -89,8 +89,8 @@ * according to the psElemType type parameter. * - * @return psVector*: Pointer to psVector. + * @return psVector* : Pointer to psVector. * */ -psVector *psVectorRecycle(psVector * restrict psVec, +psVector* psVectorRecycle(psVector* restrict psVec, ///< Vector to recycle. If NULL, a new vector is created. No effort taken to // preserve the values. @@ -104,10 +104,10 @@ * all non-complex data types. * - * @return psFloatArray*: Pointer to sorted psFloatArray. + * @return psFloatArray* : Pointer to sorted psFloatArray. */ -psVector *psVectorSort(psVector * restrict outVector, ///< the output vector to recycle, or NULL if new +psVector* psVectorSort(psVector* restrict outVector, ///< the output vector to recycle, or NULL if new // vector desired. - const psVector * restrict inVector ///< the vector to sort. + const psVector* restrict inVector ///< the vector to sort. ); @@ -117,8 +117,8 @@ * sorted float values based on pre-sort index positions. * - * @return psIntArray*: Pointer to psIntArray of sorted indices. + * @return psIntArray* : Pointer to psIntArray of sorted indices. */ -psVector *psVectorSortIndex(psVector * restrict outVector, const psVector * restrict inVector); +psVector* psVectorSortIndex(psVector* restrict outVector, const psVector* restrict inVector); /// @}