Changeset 3966
- Timestamp:
- May 18, 2005, 3:09:57 PM (21 years ago)
- Location:
- branches/pap_branch_050513/psLib/src
- Files:
-
- 54 edited
-
astro/psTime.h (modified) (2 diffs)
-
astronomy/psTime.h (modified) (2 diffs)
-
collections/psArray.c (modified) (6 diffs)
-
collections/psArray.h (modified) (5 diffs)
-
collections/psBitSet.c (modified) (2 diffs)
-
collections/psBitSet.h (modified) (2 diffs)
-
collections/psHash.c (modified) (5 diffs)
-
collections/psHash.h (modified) (4 diffs)
-
collections/psList.c (modified) (8 diffs)
-
collections/psList.h (modified) (8 diffs)
-
collections/psMetadata.c (modified) (3 diffs)
-
collections/psMetadata.h (modified) (3 diffs)
-
collections/psScalar.c (modified) (2 diffs)
-
collections/psScalar.h (modified) (2 diffs)
-
dataIO/psDB.c (modified) (6 diffs)
-
dataIO/psDB.h (modified) (6 diffs)
-
dataIO/psFits.c (modified) (2 diffs)
-
dataIO/psFits.h (modified) (2 diffs)
-
dataManip/psBinaryOp.c (modified) (2 diffs)
-
dataManip/psBinaryOp.h (modified) (2 diffs)
-
dataManip/psMatrix.c (modified) (2 diffs)
-
dataManip/psMatrix.h (modified) (2 diffs)
-
dataManip/psUnaryOp.c (modified) (2 diffs)
-
dataManip/psUnaryOp.h (modified) (2 diffs)
-
db/psDB.c (modified) (6 diffs)
-
db/psDB.h (modified) (6 diffs)
-
fits/psFits.c (modified) (2 diffs)
-
fits/psFits.h (modified) (2 diffs)
-
image/psImage.c (modified) (3 diffs)
-
image/psImage.h (modified) (3 diffs)
-
math/psBinaryOp.c (modified) (2 diffs)
-
math/psBinaryOp.h (modified) (2 diffs)
-
math/psMatrix.c (modified) (2 diffs)
-
math/psMatrix.h (modified) (2 diffs)
-
math/psUnaryOp.c (modified) (2 diffs)
-
math/psUnaryOp.h (modified) (2 diffs)
-
mathtypes/psImage.c (modified) (3 diffs)
-
mathtypes/psImage.h (modified) (3 diffs)
-
mathtypes/psScalar.c (modified) (2 diffs)
-
mathtypes/psScalar.h (modified) (2 diffs)
-
sys/psMemory.c (modified) (3 diffs)
-
sys/psMemory.h (modified) (3 diffs)
-
sysUtils/psMemory.c (modified) (3 diffs)
-
sysUtils/psMemory.h (modified) (3 diffs)
-
types/psArray.c (modified) (6 diffs)
-
types/psArray.h (modified) (5 diffs)
-
types/psBitSet.c (modified) (2 diffs)
-
types/psBitSet.h (modified) (2 diffs)
-
types/psHash.c (modified) (5 diffs)
-
types/psHash.h (modified) (4 diffs)
-
types/psList.c (modified) (8 diffs)
-
types/psList.h (modified) (8 diffs)
-
types/psMetadata.c (modified) (3 diffs)
-
types/psMetadata.h (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/pap_branch_050513/psLib/src/astro/psTime.h
r3713 r3966 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $13 * @date $Date: 2005-0 4-19 02:44:12$12 * @version $Revision: 1.28.4.1 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-05-19 01:09:56 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 127 127 */ 128 128 double psTimeToLMST( 129 psTime *time, ///< psTime to be converted.129 psTime *time, ///< psTime to be converted. 130 130 double longitude ///< Longitude. 131 131 ); -
branches/pap_branch_050513/psLib/src/astronomy/psTime.h
r3713 r3966 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $13 * @date $Date: 2005-0 4-19 02:44:12$12 * @version $Revision: 1.28.4.1 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-05-19 01:09:56 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 127 127 */ 128 128 double psTimeToLMST( 129 psTime *time, ///< psTime to be converted.129 psTime *time, ///< psTime to be converted. 130 130 double longitude ///< Longitude. 131 131 ); -
branches/pap_branch_050513/psLib/src/collections/psArray.c
r3933 r3966 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.27.4. 1$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-05-1 3 22:30:02$11 * @version $Revision: 1.27.4.2 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-05-19 01:09:56 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 88 88 psArray* psArrayAdd(psArray* psArr, 89 89 int delta, 90 psPtr data)90 const psPtr data) 91 91 { 92 92 if (psArr == NULL) { … … 110 110 111 111 psBool psArrayRemove(psArray* psArr, 112 psPtr data)112 const psPtr data) 113 113 { 114 114 psBool success = false; … … 161 161 psBool psArraySet(psArray* in, ///< input array to set element in 162 162 psU32 position, ///< the element position to set 163 void* value) ///< the value to set it to 164 { 165 if (in == NULL) 166 { 163 const void* value) ///< the value to set it to 164 { 165 if (in == NULL) { 167 166 psError(PS_ERR_BAD_PARAMETER_NULL, true, 168 167 PS_ERRORTEXT_psArray_ARRAY_NULL); … … 170 169 } 171 170 172 if (position >= in->nalloc) 173 { 171 if (position >= in->nalloc) { 174 172 psError(PS_ERR_BAD_PARAMETER_NULL, true, 175 173 PS_ERRORTEXT_psArray_POSITION_BEYOND_NALLOC, … … 185 183 186 184 /// Get an element in the array. 187 void* psArrayGet( psArray* in, psU32 position )185 void* psArrayGet(const psArray* in, psU32 position ) 188 186 { 189 187 if (in == NULL) { -
branches/pap_branch_050513/psLib/src/collections/psArray.h
r3933 r3966 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.22.8. 1$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-05-1 3 22:30:02$14 * @version $Revision: 1.22.8.2 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-05-19 01:09:56 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 80 80 int delta, 81 81 ///< the amount to expand array, if necessary. If less than one, 10 will be used. 82 psPtr data///< the data pointer to add to psArray82 const psPtr data ///< the data pointer to add to psArray 83 83 ); 84 84 … … 93 93 psBool psArrayRemove( 94 94 psArray* psArr, ///< array to operate on 95 psPtr data///< the data pointer to remove from psArray95 const psPtr data ///< the data pointer to remove from psArray 96 96 ); 97 97 … … 134 134 psArray* in, ///< input array to set element in 135 135 psU32 position, ///< the element position to set 136 void* value///< the value to set it to136 const void* value ///< the value to set it to 137 137 ); 138 138 … … 142 142 */ 143 143 void* psArrayGet( 144 psArray* in,///< input array to get element from144 const psArray* in, ///< input array to get element from 145 145 psU32 position ///< the element position to get 146 146 ); -
branches/pap_branch_050513/psLib/src/collections/psBitSet.c
r3682 r3966 11 11 * @author Robert DeSonia, MHPCC 12 12 * 13 * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $14 * @date $Date: 2005-0 4-07 20:27:41$13 * @version $Revision: 1.24.4.1 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-05-19 01:09:56 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 162 162 psBitSet* psBitSetOp(psBitSet* outBitSet, 163 163 const psBitSet* inBitSet1, 164 c har *operator,164 const char *operator, 165 165 const psBitSet* inBitSet2) 166 166 { -
branches/pap_branch_050513/psLib/src/collections/psBitSet.h
r3264 r3966 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 2-17 19:26:23$14 * @version $Revision: 1.17.8.1 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-05-19 01:09:56 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 113 113 psBitSet* outMask, ///< Resulting psBitSet from binary operation 114 114 const psBitSet* inMask1, ///< First psBitSet on which to operate 115 c har *operator,///< Bit operation115 const char *operator, ///< Bit operation 116 116 const psBitSet* inMask2 ///< First psBitSet on which to operate 117 117 ); -
branches/pap_branch_050513/psLib/src/collections/psHash.c
r3769 r3966 12 12 * @author Robert DeSonia, MHPCC 13 13 * 14 * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 4-26 19:53:30$14 * @version $Revision: 1.15.2.1 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-05-19 01:09:56 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 42 42 The linked list 43 43 *****************************************************************************/ 44 psList* psHashKeyList( psHash* table)44 psList* psHashKeyList(const psHash* table) 45 45 { 46 46 psS32 i = 0; // Loop index variable … … 344 344 psBool psHashAdd(psHash* table, 345 345 const char *key, 346 psPtr data)346 const psPtr data) 347 347 { 348 348 if (table == NULL) { … … 376 376 The data associated with that key. 377 377 *****************************************************************************/ 378 psPtr psHashLookup( psHash* table,// table to lookup key in378 psPtr psHashLookup(const psHash* table, // table to lookup key in 379 379 const char *key) // key to lookup 380 380 { … … 429 429 } 430 430 431 psArray* psHashToArray( psHash* table)431 psArray* psHashToArray(const psHash* table) 432 432 { 433 433 -
branches/pap_branch_050513/psLib/src/collections/psHash.h
r3264 r3966 12 12 * @author Robert DeSonia, MHPCC 13 13 * 14 * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 2-17 19:26:23$14 * @version $Revision: 1.7.8.1 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-05-19 01:09:56 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 54 54 psHash* table, ///< table to insert in 55 55 const char *key, ///< key to use 56 psPtr data///< data to insert56 const psPtr data ///< data to insert 57 57 ); 58 58 59 59 /// Lookup key in table. 60 60 psPtr psHashLookup( 61 psHash* table,///< table to lookup key in61 const psHash* table, ///< table to lookup key in 62 62 const char *key ///< key to lookup 63 63 ); … … 71 71 /// List all keys in table. 72 72 psList* psHashKeyList( 73 psHash* table///< table to list keys from.73 const psHash* table ///< table to list keys from. 74 74 ); 75 75 … … 79 79 */ 80 80 psArray* psHashToArray( 81 psHash* table///< table to convert to psArray81 const psHash* table ///< table to convert to psArray 82 82 ); 83 83 -
branches/pap_branch_050513/psLib/src/collections/psList.c
r3682 r3966 6 6 * @author Robert Daniel DeSonia, MHPCC 7 7 * 8 * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $9 * @date $Date: 2005-0 4-07 20:27:41$8 * @version $Revision: 1.35.4.1 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2005-05-19 01:09:56 $ 10 10 * 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 125 125 } 126 126 127 psList* psListAlloc( psPtr data)127 psList* psListAlloc(const psPtr data) 128 128 { 129 129 psList* list = psAlloc(sizeof(psList)); … … 247 247 } 248 248 249 psBool psListAdd(psList* list, psS32 location, psPtr data)249 psBool psListAdd(psList* list, psS32 location, const psPtr data) 250 250 { 251 251 … … 283 283 } 284 284 285 bool psListAddAfter(psListIterator* iterator, void* data)285 bool psListAddAfter(psListIterator* iterator, const void* data) 286 286 { 287 287 if (data == NULL) { … … 358 358 } 359 359 360 bool psListAddBefore(psListIterator* iterator, void* data)360 bool psListAddBefore(psListIterator* iterator, const void* data) 361 361 { 362 362 if (data == NULL) { … … 452 452 453 453 psBool psListRemoveData(psList* list, 454 psPtr data)454 const psPtr data) 455 455 { 456 456 if (list == NULL) { … … 564 564 * Convert a psList to/from a psVoidPtrArray 565 565 */ 566 psArray* psListToArray( psList* restrict list)566 psArray* psListToArray(const psList* restrict list) 567 567 { 568 568 psListElem* ptr; … … 592 592 } 593 593 594 psList* psArrayToList( psArray* arr)594 psList* psArrayToList(const psArray* arr) 595 595 { 596 596 psU32 n; -
branches/pap_branch_050513/psLib/src/collections/psList.h
r3409 r3966 10 10 * @ingroup LinkedList 11 11 * 12 * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $13 * @date $Date: 2005-0 3-11 23:17:46 $12 * @version $Revision: 1.23.8.1 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-05-19 01:09:56 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 88 88 */ 89 89 psList* psListAlloc( 90 psPtr data90 const psPtr data 91 91 ///< initial data item; may be NULL if no an empty psList is desired 92 92 ) … … 121 121 psList* list, ///< list to add item to 122 122 psS32 location, ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location. 123 psPtr data///< data item to add. If NULL, list is not modified.123 const psPtr data ///< data item to add. If NULL, list is not modified. 124 124 ); 125 125 … … 130 130 psBool psListAddAfter( 131 131 psListIterator* list, ///< list position to add item to 132 psPtr data///< data item to add. If NULL, list is not modified.132 const psPtr data ///< data item to add. If NULL, list is not modified. 133 133 ); 134 134 … … 139 139 psBool psListAddBefore( 140 140 psListIterator* list, ///< list position to add item to 141 psPtr data///< data item to add. If NULL, list is not modified.141 const psPtr data ///< data item to add. If NULL, list is not modified. 142 142 ); 143 143 … … 157 157 psBool psListRemoveData( 158 158 psList* list, ///< list to remove element from 159 psPtr data///< data item to find and remove159 const psPtr data ///< data item to find and remove 160 160 ); 161 161 … … 196 196 */ 197 197 psArray* psListToArray( 198 psList* dlist///< List to convert198 const psList* dlist ///< List to convert 199 199 ); 200 200 … … 205 205 */ 206 206 psList* psArrayToList( 207 psArray* arr///< vector to convert207 const psArray* arr ///< vector to convert 208 208 ); 209 209 -
branches/pap_branch_050513/psLib/src/collections/psMetadata.c
r3780 r3966 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.61 $ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 4-28 19:52:48$14 * @version $Revision: 1.61.2.1 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-05-19 01:09:56 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 240 240 } 241 241 242 psBool psMetadataAddItem(psMetadata *md, psMetadataItem *metadataItem, psS32 location, psS32 flags)242 psBool psMetadataAddItem(psMetadata *md, const psMetadataItem *metadataItem, psS32 location, psS32 flags) 243 243 { 244 244 char * key = NULL; … … 349 349 #define METADATA_ADD_TYPE(NAME,TYPE,METATYPE) \ 350 350 psBool psMetadataAdd##NAME(psMetadata* md, psS32 where, const char* name, \ 351 const char* comment, TYPE value) { \351 const char* comment, const TYPE value) { \ 352 352 return psMetadataAdd(md,where,name, METATYPE,comment,value); \ 353 353 } -
branches/pap_branch_050513/psLib/src/collections/psMetadata.h
r3684 r3966 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $14 * @date $Date: 2005-0 4-08 17:58:57$13 * @version $Revision: 1.44.4.1 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-05-19 01:09:56 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 259 259 psBool psMetadataAddItem( 260 260 psMetadata* md, ///< Metadata collection to insert metadat item. 261 psMetadataItem* item,///< Metadata item to be added.261 const psMetadataItem* item, ///< Metadata item to be added. 262 262 psS32 location, ///< Location to be added. 263 263 psS32 flags ///< Options flag mask, see psMetadataFlags enum … … 303 303 const char* comment, psF64 value); 304 304 psBool psMetadataAddList(psMetadata* md, psS32 location, const char* name, 305 const char* comment, psList* value);305 const char* comment, const psList* value); 306 306 psBool psMetadataAddStr(psMetadata* md, psS32 location, const char* name, 307 307 const char* comment, const char* value); 308 308 psBool psMetadataAddVector(psMetadata* md, psS32 location, const char* name, 309 const char* comment, psVector* value);309 const char* comment, const psVector* value); 310 310 psBool psMetadataAddImage(psMetadata* md, psS32 location, const char* name, 311 const char* comment, psImage* value);311 const char* comment, const psImage* value); 312 312 psBool psMetadataAddHash(psMetadata* md, psS32 location, const char* name, 313 const char* comment, psHash* value);313 const char* comment, const psHash* value); 314 314 psBool psMetadataAddLookupTable(psMetadata* md, psS32 location, const char* name, 315 const char* comment, psLookupTable* value);315 const char* comment, const psLookupTable* value); 316 316 psBool psMetadataAddUnknown(psMetadata* md, psS32 location, const char* name, 317 const char* comment, psPtr value);317 const char* comment, const psPtr value); 318 318 319 319 /** Remove an item from metadata collection. -
branches/pap_branch_050513/psLib/src/collections/psScalar.c
r3264 r3966 8 8 * @author Ross Harman, MHPCC 9 9 * 10 * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $11 * @date $Date: 2005-0 2-17 19:26:23$10 * @version $Revision: 1.14.8.1 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2005-05-19 01:09:56 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 80 80 } 81 81 82 psScalar* psScalarCopy( psScalar *scalar)82 psScalar* psScalarCopy(const psScalar *scalar) 83 83 { 84 84 psElemType dataType; -
branches/pap_branch_050513/psLib/src/collections/psScalar.h
r3264 r3966 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $14 * @date $Date: 2005-0 2-17 19:26:23$13 * @version $Revision: 1.11.8.1 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-05-19 01:09:56 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 77 77 */ 78 78 psScalar* psScalarCopy( 79 psScalar *scalar///< Scalar to copy.79 const psScalar *scalar ///< Scalar to copy. 80 80 ); 81 81 -
branches/pap_branch_050513/psLib/src/dataIO/psDB.c
r3866 r3966 12 12 * @author Joshua Hoblitt 13 13 * 14 * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $15 * @date $Date: 2005-05- 06 18:15:25$14 * @version $Revision: 1.16.2.1 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-05-19 01:09:56 $ 16 16 * 17 17 * Copyright 2005 Joshua Hoblitt, University of Hawaii … … 175 175 } 176 176 177 bool psDBCreateTable(psDB *dbh, const char *tableName, psMetadata *md)177 bool psDBCreateTable(psDB *dbh, const char *tableName, const psMetadata *md) 178 178 { 179 179 char *query; … … 469 469 } 470 470 471 bool psDBInsertOneRow(psDB *dbh, const char *tableName, psMetadata *row)471 bool psDBInsertOneRow(psDB *dbh, const char *tableName, const psMetadata *row) 472 472 { 473 473 psArray *rowSet; // psArray of row to insert … … 490 490 } 491 491 492 bool psDBInsertRows(psDB *dbh, const char *tableName, psArray *rowSet)492 bool psDBInsertRows(psDB *dbh, const char *tableName, const psArray *rowSet) 493 493 { 494 494 psMetadata *row; // row of data … … 631 631 } 632 632 633 psS64 psDBUpdateRows(psDB *dbh, const char *tableName, psMetadata *where,psMetadata *values)633 psS64 psDBUpdateRows(psDB *dbh, const char *tableName, const psMetadata *where, const psMetadata *values) 634 634 { 635 635 char *query; … … 713 713 } 714 714 715 psS64 psDBDeleteRows(psDB *dbh, const char *tableName, psMetadata *where)715 psS64 psDBDeleteRows(psDB *dbh, const char *tableName, const psMetadata *where) 716 716 { 717 717 char *query; -
branches/pap_branch_050513/psLib/src/dataIO/psDB.h
r3598 r3966 10 10 * @author Joshua Hoblitt 11 11 * 12 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $13 * @date $Date: 2005-0 3-31 23:01:46 $12 * @version $Revision: 1.5.8.1 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-05-19 01:09:56 $ 14 14 * 15 15 * Copyright 2005 Joshua Hoblitt, University of Hawaii … … 106 106 psDB *dbh, ///< Database handle 107 107 const char *tableName, ///< Table name 108 psMetadata *md///< Column names, types, and indexes108 const psMetadata *md ///< Column names, types, and indexes 109 109 ); 110 110 … … 184 184 psDB *dbh, ///< Database handle 185 185 const char *tableName, ///< Table name 186 psMetadata *row///< Row description186 const psMetadata *row ///< Row description 187 187 ); 188 188 … … 199 199 psDB *dbh, ///< Database handle 200 200 const char *tableName, ///< Table name 201 psArray *rowSet///< Set of rows to insert201 const psArray *rowSet ///< Set of rows to insert 202 202 ); 203 203 … … 241 241 psDB *dbh, ///< Database handle 242 242 const char *tableName, ///< Table name 243 psMetadata *where,///< Row match criteria244 psMetadata *values///< new field values243 const psMetadata *where, ///< Row match criteria 244 const psMetadata *values ///< new field values 245 245 ); 246 246 … … 258 258 psDB *dbh, ///< Database handle 259 259 const char *tableName, ///< Table name 260 psMetadata *where///< Row match criteria260 const psMetadata *where ///< Row match criteria 261 261 ); 262 262 -
branches/pap_branch_050513/psLib/src/dataIO/psFits.c
r3851 r3966 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $10 * @date $Date: 2005-05- 05 21:25:47$9 * @version $Revision: 1.29.2.1 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-05-19 01:09:56 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 1452 1452 1453 1453 bool psFitsWriteTable(const psFits* fits, 1454 psMetadata* header,1455 psArray* table,1454 const psMetadata* header, 1455 const psArray* table, 1456 1456 char* extname) 1457 1457 { -
branches/pap_branch_050513/psLib/src/dataIO/psFits.h
r3500 r3966 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $10 * @date $Date: 2005-0 3-24 23:52:25$9 * @version $Revision: 1.10.8.1 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-05-19 01:09:56 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 243 243 bool psFitsWriteTable( 244 244 const psFits* fits, ///< the psFits object 245 psMetadata* header,///< header items for the new HDU. Can be NULL.246 psArray* table,245 const psMetadata* header, ///< header items for the new HDU. Can be NULL. 246 const psArray* table, 247 247 ///< Array of psMetadata items, which contains the output data items of each row. 248 248 char* extname ///< extension name -
branches/pap_branch_050513/psLib/src/dataManip/psBinaryOp.c
r3182 r3966 30 30 * @author Robert DeSonia, MHPCC 31 31 * 32 * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $33 * @date $Date: 2005-0 2-10 02:36:41$32 * @version $Revision: 1.1.8.1 $ $Name: not supported by cvs2svn $ 33 * @date $Date: 2005-05-19 01:09:56 $ 34 34 * 35 35 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 426 426 } 427 427 428 psPtr psBinaryOp(psPtr out, psPtr in1, char *op,psPtr in2)428 psPtr psBinaryOp(psPtr out, const psPtr in1, const char *op, const psPtr in2) 429 429 { 430 430 -
branches/pap_branch_050513/psLib/src/dataManip/psBinaryOp.h
r3182 r3966 31 31 * @author Robert DeSonia, MHPCC 32 32 * 33 * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $34 * @date $Date: 2005-0 2-10 02:36:41$33 * @version $Revision: 1.1.8.1 $ $Name: not supported by cvs2svn $ 34 * @date $Date: 2005-05-19 01:09:56 $ 35 35 * 36 36 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 58 58 psType* psBinaryOp( 59 59 psPtr out, ///< Output type, either psImage or psVector. 60 psPtr in1,///< First input, either psImage or psVector.61 c har *op,///< Operator.62 psPtr in2///< Second input, either psImage or psVector.60 const psPtr in1, ///< First input, either psImage or psVector. 61 const char *op, ///< Operator. 62 const psPtr in2 ///< Second input, either psImage or psVector. 63 63 ); 64 64 -
branches/pap_branch_050513/psLib/src/dataManip/psMatrix.c
r3880 r3966 21 21 * @author Robert DeSonia, MHPCC 22 22 * 23 * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $24 * @date $Date: 2005-05-1 1 02:29:39$23 * @version $Revision: 1.28.2.1 $ $Name: not supported by cvs2svn $ 24 * @date $Date: 2005-05-19 01:09:56 $ 25 25 * 26 26 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 470 470 } 471 471 472 psImage* psMatrixEigenvectors(psImage* outImage, psImage* inImage)472 psImage* psMatrixEigenvectors(psImage* outImage, const psImage* inImage) 473 473 { 474 474 psS32 numRows = 0; -
branches/pap_branch_050513/psLib/src/dataManip/psMatrix.h
r3264 r3966 22 22 * @author Ross Harman, MHPCC 23 23 * 24 * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $25 * @date $Date: 2005-0 2-17 19:26:23$24 * @version $Revision: 1.15.8.1 $ $Name: not supported by cvs2svn $ 25 * @date $Date: 2005-05-19 01:09:56 $ 26 26 * 27 27 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 131 131 psImage* psMatrixEigenvectors( 132 132 psImage* outImage, ///< Eigenvectors to return, or NULL. 133 psImage* inImage///< Input image.133 const psImage* inImage ///< Input image. 134 134 ); 135 135 -
branches/pap_branch_050513/psLib/src/dataManip/psUnaryOp.c
r3887 r3966 30 30 * @author Robert DeSonia, MHPCC 31 31 * 32 * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $33 * @date $Date: 2005-05-1 2 00:54:49$32 * @version $Revision: 1.2.2.1 $ $Name: not supported by cvs2svn $ 33 * @date $Date: 2005-05-19 01:09:56 $ 34 34 * 35 35 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 304 304 } 305 305 306 psPtr psUnaryOp(psPtr out, psPtr in,char *op)306 psPtr psUnaryOp(psPtr out, const psPtr in, const char *op) 307 307 { 308 308 #define psUnaryOp_EXIT { \ -
branches/pap_branch_050513/psLib/src/dataManip/psUnaryOp.h
r3182 r3966 30 30 * @author Robert DeSonia, MHPCC 31 31 * 32 * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $33 * @date $Date: 2005-0 2-10 02:36:41$32 * @version $Revision: 1.1.8.1 $ $Name: not supported by cvs2svn $ 33 * @date $Date: 2005-05-19 01:09:56 $ 34 34 * 35 35 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 61 61 psType* psUnaryOp( 62 62 psPtr out, ///< Output type, either psImage or psVector. 63 psPtr in,///< Input, either psImage or psVector.64 c har *op ///< Operator.63 const psPtr in, ///< Input, either psImage or psVector. 64 const char *op ///< operator. 65 65 ); 66 66 -
branches/pap_branch_050513/psLib/src/db/psDB.c
r3866 r3966 12 12 * @author Joshua Hoblitt 13 13 * 14 * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $15 * @date $Date: 2005-05- 06 18:15:25$14 * @version $Revision: 1.16.2.1 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-05-19 01:09:56 $ 16 16 * 17 17 * Copyright 2005 Joshua Hoblitt, University of Hawaii … … 175 175 } 176 176 177 bool psDBCreateTable(psDB *dbh, const char *tableName, psMetadata *md)177 bool psDBCreateTable(psDB *dbh, const char *tableName, const psMetadata *md) 178 178 { 179 179 char *query; … … 469 469 } 470 470 471 bool psDBInsertOneRow(psDB *dbh, const char *tableName, psMetadata *row)471 bool psDBInsertOneRow(psDB *dbh, const char *tableName, const psMetadata *row) 472 472 { 473 473 psArray *rowSet; // psArray of row to insert … … 490 490 } 491 491 492 bool psDBInsertRows(psDB *dbh, const char *tableName, psArray *rowSet)492 bool psDBInsertRows(psDB *dbh, const char *tableName, const psArray *rowSet) 493 493 { 494 494 psMetadata *row; // row of data … … 631 631 } 632 632 633 psS64 psDBUpdateRows(psDB *dbh, const char *tableName, psMetadata *where,psMetadata *values)633 psS64 psDBUpdateRows(psDB *dbh, const char *tableName, const psMetadata *where, const psMetadata *values) 634 634 { 635 635 char *query; … … 713 713 } 714 714 715 psS64 psDBDeleteRows(psDB *dbh, const char *tableName, psMetadata *where)715 psS64 psDBDeleteRows(psDB *dbh, const char *tableName, const psMetadata *where) 716 716 { 717 717 char *query; -
branches/pap_branch_050513/psLib/src/db/psDB.h
r3598 r3966 10 10 * @author Joshua Hoblitt 11 11 * 12 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $13 * @date $Date: 2005-0 3-31 23:01:46 $12 * @version $Revision: 1.5.8.1 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-05-19 01:09:56 $ 14 14 * 15 15 * Copyright 2005 Joshua Hoblitt, University of Hawaii … … 106 106 psDB *dbh, ///< Database handle 107 107 const char *tableName, ///< Table name 108 psMetadata *md///< Column names, types, and indexes108 const psMetadata *md ///< Column names, types, and indexes 109 109 ); 110 110 … … 184 184 psDB *dbh, ///< Database handle 185 185 const char *tableName, ///< Table name 186 psMetadata *row///< Row description186 const psMetadata *row ///< Row description 187 187 ); 188 188 … … 199 199 psDB *dbh, ///< Database handle 200 200 const char *tableName, ///< Table name 201 psArray *rowSet///< Set of rows to insert201 const psArray *rowSet ///< Set of rows to insert 202 202 ); 203 203 … … 241 241 psDB *dbh, ///< Database handle 242 242 const char *tableName, ///< Table name 243 psMetadata *where,///< Row match criteria244 psMetadata *values///< new field values243 const psMetadata *where, ///< Row match criteria 244 const psMetadata *values ///< new field values 245 245 ); 246 246 … … 258 258 psDB *dbh, ///< Database handle 259 259 const char *tableName, ///< Table name 260 psMetadata *where///< Row match criteria260 const psMetadata *where ///< Row match criteria 261 261 ); 262 262 -
branches/pap_branch_050513/psLib/src/fits/psFits.c
r3851 r3966 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $10 * @date $Date: 2005-05- 05 21:25:47$9 * @version $Revision: 1.29.2.1 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-05-19 01:09:56 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 1452 1452 1453 1453 bool psFitsWriteTable(const psFits* fits, 1454 psMetadata* header,1455 psArray* table,1454 const psMetadata* header, 1455 const psArray* table, 1456 1456 char* extname) 1457 1457 { -
branches/pap_branch_050513/psLib/src/fits/psFits.h
r3500 r3966 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $10 * @date $Date: 2005-0 3-24 23:52:25$9 * @version $Revision: 1.10.8.1 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-05-19 01:09:56 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 243 243 bool psFitsWriteTable( 244 244 const psFits* fits, ///< the psFits object 245 psMetadata* header,///< header items for the new HDU. Can be NULL.246 psArray* table,245 const psMetadata* header, ///< header items for the new HDU. Can be NULL. 246 const psArray* table, 247 247 ///< Array of psMetadata items, which contains the output data items of each row. 248 248 char* extname ///< extension name -
branches/pap_branch_050513/psLib/src/image/psImage.c
r3948 r3966 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.65.2. 1$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-05-1 6 21:07:01$11 * @version $Revision: 1.65.2.2 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-05-19 01:09:57 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 106 106 } 107 107 108 psRegion* psRegionFromString(c har* region)108 psRegion* psRegionFromString(const char* region) 109 109 { 110 110 psS32 col0; … … 137 137 } 138 138 139 char* psRegionToString( psRegion* region)139 char* psRegionToString(const psRegion* region) 140 140 { 141 141 char tmpText[256]; // big enough to store any region as text -
branches/pap_branch_050513/psLib/src/image/psImage.h
r3947 r3966 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.51.2. 1$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-05-1 6 21:06:37 $13 * @version $Revision: 1.51.2.2 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-05-19 01:09:57 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 131 131 */ 132 132 psRegion* psRegionFromString( 133 c har* region///< image rectangular region in the form '[x0:x1,y0:y1]'133 const char* region ///< image rectangular region in the form '[x0:x1,y0:y1]' 134 134 ); 135 135 … … 140 140 */ 141 141 char* psRegionToString( 142 psRegion* region///< the psRegion to convert to a string142 const psRegion* region ///< the psRegion to convert to a string 143 143 ); 144 144 -
branches/pap_branch_050513/psLib/src/math/psBinaryOp.c
r3182 r3966 30 30 * @author Robert DeSonia, MHPCC 31 31 * 32 * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $33 * @date $Date: 2005-0 2-10 02:36:41$32 * @version $Revision: 1.1.8.1 $ $Name: not supported by cvs2svn $ 33 * @date $Date: 2005-05-19 01:09:56 $ 34 34 * 35 35 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 426 426 } 427 427 428 psPtr psBinaryOp(psPtr out, psPtr in1, char *op,psPtr in2)428 psPtr psBinaryOp(psPtr out, const psPtr in1, const char *op, const psPtr in2) 429 429 { 430 430 -
branches/pap_branch_050513/psLib/src/math/psBinaryOp.h
r3182 r3966 31 31 * @author Robert DeSonia, MHPCC 32 32 * 33 * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $34 * @date $Date: 2005-0 2-10 02:36:41$33 * @version $Revision: 1.1.8.1 $ $Name: not supported by cvs2svn $ 34 * @date $Date: 2005-05-19 01:09:56 $ 35 35 * 36 36 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 58 58 psType* psBinaryOp( 59 59 psPtr out, ///< Output type, either psImage or psVector. 60 psPtr in1,///< First input, either psImage or psVector.61 c har *op,///< Operator.62 psPtr in2///< Second input, either psImage or psVector.60 const psPtr in1, ///< First input, either psImage or psVector. 61 const char *op, ///< Operator. 62 const psPtr in2 ///< Second input, either psImage or psVector. 63 63 ); 64 64 -
branches/pap_branch_050513/psLib/src/math/psMatrix.c
r3880 r3966 21 21 * @author Robert DeSonia, MHPCC 22 22 * 23 * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $24 * @date $Date: 2005-05-1 1 02:29:39$23 * @version $Revision: 1.28.2.1 $ $Name: not supported by cvs2svn $ 24 * @date $Date: 2005-05-19 01:09:56 $ 25 25 * 26 26 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 470 470 } 471 471 472 psImage* psMatrixEigenvectors(psImage* outImage, psImage* inImage)472 psImage* psMatrixEigenvectors(psImage* outImage, const psImage* inImage) 473 473 { 474 474 psS32 numRows = 0; -
branches/pap_branch_050513/psLib/src/math/psMatrix.h
r3264 r3966 22 22 * @author Ross Harman, MHPCC 23 23 * 24 * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $25 * @date $Date: 2005-0 2-17 19:26:23$24 * @version $Revision: 1.15.8.1 $ $Name: not supported by cvs2svn $ 25 * @date $Date: 2005-05-19 01:09:56 $ 26 26 * 27 27 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 131 131 psImage* psMatrixEigenvectors( 132 132 psImage* outImage, ///< Eigenvectors to return, or NULL. 133 psImage* inImage///< Input image.133 const psImage* inImage ///< Input image. 134 134 ); 135 135 -
branches/pap_branch_050513/psLib/src/math/psUnaryOp.c
r3887 r3966 30 30 * @author Robert DeSonia, MHPCC 31 31 * 32 * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $33 * @date $Date: 2005-05-1 2 00:54:49$32 * @version $Revision: 1.2.2.1 $ $Name: not supported by cvs2svn $ 33 * @date $Date: 2005-05-19 01:09:56 $ 34 34 * 35 35 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 304 304 } 305 305 306 psPtr psUnaryOp(psPtr out, psPtr in,char *op)306 psPtr psUnaryOp(psPtr out, const psPtr in, const char *op) 307 307 { 308 308 #define psUnaryOp_EXIT { \ -
branches/pap_branch_050513/psLib/src/math/psUnaryOp.h
r3182 r3966 30 30 * @author Robert DeSonia, MHPCC 31 31 * 32 * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $33 * @date $Date: 2005-0 2-10 02:36:41$32 * @version $Revision: 1.1.8.1 $ $Name: not supported by cvs2svn $ 33 * @date $Date: 2005-05-19 01:09:56 $ 34 34 * 35 35 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 61 61 psType* psUnaryOp( 62 62 psPtr out, ///< Output type, either psImage or psVector. 63 psPtr in,///< Input, either psImage or psVector.64 c har *op ///< Operator.63 const psPtr in, ///< Input, either psImage or psVector. 64 const char *op ///< operator. 65 65 ); 66 66 -
branches/pap_branch_050513/psLib/src/mathtypes/psImage.c
r3948 r3966 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.65.2. 1$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-05-1 6 21:07:01$11 * @version $Revision: 1.65.2.2 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-05-19 01:09:57 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 106 106 } 107 107 108 psRegion* psRegionFromString(c har* region)108 psRegion* psRegionFromString(const char* region) 109 109 { 110 110 psS32 col0; … … 137 137 } 138 138 139 char* psRegionToString( psRegion* region)139 char* psRegionToString(const psRegion* region) 140 140 { 141 141 char tmpText[256]; // big enough to store any region as text -
branches/pap_branch_050513/psLib/src/mathtypes/psImage.h
r3947 r3966 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.51.2. 1$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-05-1 6 21:06:37 $13 * @version $Revision: 1.51.2.2 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-05-19 01:09:57 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 131 131 */ 132 132 psRegion* psRegionFromString( 133 c har* region///< image rectangular region in the form '[x0:x1,y0:y1]'133 const char* region ///< image rectangular region in the form '[x0:x1,y0:y1]' 134 134 ); 135 135 … … 140 140 */ 141 141 char* psRegionToString( 142 psRegion* region///< the psRegion to convert to a string142 const psRegion* region ///< the psRegion to convert to a string 143 143 ); 144 144 -
branches/pap_branch_050513/psLib/src/mathtypes/psScalar.c
r3264 r3966 8 8 * @author Ross Harman, MHPCC 9 9 * 10 * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $11 * @date $Date: 2005-0 2-17 19:26:23$10 * @version $Revision: 1.14.8.1 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2005-05-19 01:09:56 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 80 80 } 81 81 82 psScalar* psScalarCopy( psScalar *scalar)82 psScalar* psScalarCopy(const psScalar *scalar) 83 83 { 84 84 psElemType dataType; -
branches/pap_branch_050513/psLib/src/mathtypes/psScalar.h
r3264 r3966 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $14 * @date $Date: 2005-0 2-17 19:26:23$13 * @version $Revision: 1.11.8.1 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-05-19 01:09:56 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 77 77 */ 78 78 psScalar* psScalarCopy( 79 psScalar *scalar///< Scalar to copy.79 const psScalar *scalar ///< Scalar to copy. 80 80 ); 81 81 -
branches/pap_branch_050513/psLib/src/sys/psMemory.c
r3784 r3966 8 8 * @author Robert Lupton, Princeton University 9 9 * 10 * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $11 * @date $Date: 2005-0 4-29 00:39:22$10 * @version $Revision: 1.51.2.1 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2005-05-19 01:09:57 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 504 504 505 505 // return refCounter 506 psReferenceCount psMemGetRefCounter( psPtr vptr)506 psReferenceCount psMemGetRefCounter(const psPtr vptr) 507 507 { 508 508 psMemBlock* ptr; … … 527 527 528 528 // increment and return refCounter 529 psPtr p_psMemIncrRefCounter( psPtr vptr, const char *file, psS32 lineno)529 psPtr p_psMemIncrRefCounter(const psPtr vptr, const char *file, psS32 lineno) 530 530 { 531 531 psMemBlock* ptr; -
branches/pap_branch_050513/psLib/src/sys/psMemory.h
r3682 r3966 12 12 * @ingroup MemoryManagement 13 13 * 14 * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 4-07 20:27:41$14 * @version $Revision: 1.36.4.1 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-05-19 01:09:57 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 279 279 */ 280 280 psReferenceCount psMemGetRefCounter( 281 psPtr vptr///< Pointer to get refCounter for281 const psPtr vptr ///< Pointer to get refCounter for 282 282 ); 283 283 … … 288 288 #ifdef DOXYGEN 289 289 psPtr psMemIncrRefCounter( 290 psPtr vptr ///< Pointer to increment refCounter, and return290 const psPtr vptr ///< Pointer to increment refCounter, and return 291 291 ); 292 292 #else 293 293 psPtr p_psMemIncrRefCounter( 294 psPtr vptr, ///< Pointer to increment refCounter, and return294 const psPtr vptr, ///< Pointer to increment refCounter, and return 295 295 const char *file, ///< File of call 296 296 psS32 lineno ///< Line number of call -
branches/pap_branch_050513/psLib/src/sysUtils/psMemory.c
r3784 r3966 8 8 * @author Robert Lupton, Princeton University 9 9 * 10 * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $11 * @date $Date: 2005-0 4-29 00:39:22$10 * @version $Revision: 1.51.2.1 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2005-05-19 01:09:57 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 504 504 505 505 // return refCounter 506 psReferenceCount psMemGetRefCounter( psPtr vptr)506 psReferenceCount psMemGetRefCounter(const psPtr vptr) 507 507 { 508 508 psMemBlock* ptr; … … 527 527 528 528 // increment and return refCounter 529 psPtr p_psMemIncrRefCounter( psPtr vptr, const char *file, psS32 lineno)529 psPtr p_psMemIncrRefCounter(const psPtr vptr, const char *file, psS32 lineno) 530 530 { 531 531 psMemBlock* ptr; -
branches/pap_branch_050513/psLib/src/sysUtils/psMemory.h
r3682 r3966 12 12 * @ingroup MemoryManagement 13 13 * 14 * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 4-07 20:27:41$14 * @version $Revision: 1.36.4.1 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-05-19 01:09:57 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 279 279 */ 280 280 psReferenceCount psMemGetRefCounter( 281 psPtr vptr///< Pointer to get refCounter for281 const psPtr vptr ///< Pointer to get refCounter for 282 282 ); 283 283 … … 288 288 #ifdef DOXYGEN 289 289 psPtr psMemIncrRefCounter( 290 psPtr vptr ///< Pointer to increment refCounter, and return290 const psPtr vptr ///< Pointer to increment refCounter, and return 291 291 ); 292 292 #else 293 293 psPtr p_psMemIncrRefCounter( 294 psPtr vptr, ///< Pointer to increment refCounter, and return294 const psPtr vptr, ///< Pointer to increment refCounter, and return 295 295 const char *file, ///< File of call 296 296 psS32 lineno ///< Line number of call -
branches/pap_branch_050513/psLib/src/types/psArray.c
r3933 r3966 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.27.4. 1$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-05-1 3 22:30:02$11 * @version $Revision: 1.27.4.2 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-05-19 01:09:56 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 88 88 psArray* psArrayAdd(psArray* psArr, 89 89 int delta, 90 psPtr data)90 const psPtr data) 91 91 { 92 92 if (psArr == NULL) { … … 110 110 111 111 psBool psArrayRemove(psArray* psArr, 112 psPtr data)112 const psPtr data) 113 113 { 114 114 psBool success = false; … … 161 161 psBool psArraySet(psArray* in, ///< input array to set element in 162 162 psU32 position, ///< the element position to set 163 void* value) ///< the value to set it to 164 { 165 if (in == NULL) 166 { 163 const void* value) ///< the value to set it to 164 { 165 if (in == NULL) { 167 166 psError(PS_ERR_BAD_PARAMETER_NULL, true, 168 167 PS_ERRORTEXT_psArray_ARRAY_NULL); … … 170 169 } 171 170 172 if (position >= in->nalloc) 173 { 171 if (position >= in->nalloc) { 174 172 psError(PS_ERR_BAD_PARAMETER_NULL, true, 175 173 PS_ERRORTEXT_psArray_POSITION_BEYOND_NALLOC, … … 185 183 186 184 /// Get an element in the array. 187 void* psArrayGet( psArray* in, psU32 position )185 void* psArrayGet(const psArray* in, psU32 position ) 188 186 { 189 187 if (in == NULL) { -
branches/pap_branch_050513/psLib/src/types/psArray.h
r3933 r3966 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.22.8. 1$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-05-1 3 22:30:02$14 * @version $Revision: 1.22.8.2 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-05-19 01:09:56 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 80 80 int delta, 81 81 ///< the amount to expand array, if necessary. If less than one, 10 will be used. 82 psPtr data///< the data pointer to add to psArray82 const psPtr data ///< the data pointer to add to psArray 83 83 ); 84 84 … … 93 93 psBool psArrayRemove( 94 94 psArray* psArr, ///< array to operate on 95 psPtr data///< the data pointer to remove from psArray95 const psPtr data ///< the data pointer to remove from psArray 96 96 ); 97 97 … … 134 134 psArray* in, ///< input array to set element in 135 135 psU32 position, ///< the element position to set 136 void* value///< the value to set it to136 const void* value ///< the value to set it to 137 137 ); 138 138 … … 142 142 */ 143 143 void* psArrayGet( 144 psArray* in,///< input array to get element from144 const psArray* in, ///< input array to get element from 145 145 psU32 position ///< the element position to get 146 146 ); -
branches/pap_branch_050513/psLib/src/types/psBitSet.c
r3682 r3966 11 11 * @author Robert DeSonia, MHPCC 12 12 * 13 * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $14 * @date $Date: 2005-0 4-07 20:27:41$13 * @version $Revision: 1.24.4.1 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-05-19 01:09:56 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 162 162 psBitSet* psBitSetOp(psBitSet* outBitSet, 163 163 const psBitSet* inBitSet1, 164 c har *operator,164 const char *operator, 165 165 const psBitSet* inBitSet2) 166 166 { -
branches/pap_branch_050513/psLib/src/types/psBitSet.h
r3264 r3966 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 2-17 19:26:23$14 * @version $Revision: 1.17.8.1 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-05-19 01:09:56 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 113 113 psBitSet* outMask, ///< Resulting psBitSet from binary operation 114 114 const psBitSet* inMask1, ///< First psBitSet on which to operate 115 c har *operator,///< Bit operation115 const char *operator, ///< Bit operation 116 116 const psBitSet* inMask2 ///< First psBitSet on which to operate 117 117 ); -
branches/pap_branch_050513/psLib/src/types/psHash.c
r3769 r3966 12 12 * @author Robert DeSonia, MHPCC 13 13 * 14 * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 4-26 19:53:30$14 * @version $Revision: 1.15.2.1 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-05-19 01:09:56 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 42 42 The linked list 43 43 *****************************************************************************/ 44 psList* psHashKeyList( psHash* table)44 psList* psHashKeyList(const psHash* table) 45 45 { 46 46 psS32 i = 0; // Loop index variable … … 344 344 psBool psHashAdd(psHash* table, 345 345 const char *key, 346 psPtr data)346 const psPtr data) 347 347 { 348 348 if (table == NULL) { … … 376 376 The data associated with that key. 377 377 *****************************************************************************/ 378 psPtr psHashLookup( psHash* table,// table to lookup key in378 psPtr psHashLookup(const psHash* table, // table to lookup key in 379 379 const char *key) // key to lookup 380 380 { … … 429 429 } 430 430 431 psArray* psHashToArray( psHash* table)431 psArray* psHashToArray(const psHash* table) 432 432 { 433 433 -
branches/pap_branch_050513/psLib/src/types/psHash.h
r3264 r3966 12 12 * @author Robert DeSonia, MHPCC 13 13 * 14 * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 2-17 19:26:23$14 * @version $Revision: 1.7.8.1 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-05-19 01:09:56 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 54 54 psHash* table, ///< table to insert in 55 55 const char *key, ///< key to use 56 psPtr data///< data to insert56 const psPtr data ///< data to insert 57 57 ); 58 58 59 59 /// Lookup key in table. 60 60 psPtr psHashLookup( 61 psHash* table,///< table to lookup key in61 const psHash* table, ///< table to lookup key in 62 62 const char *key ///< key to lookup 63 63 ); … … 71 71 /// List all keys in table. 72 72 psList* psHashKeyList( 73 psHash* table///< table to list keys from.73 const psHash* table ///< table to list keys from. 74 74 ); 75 75 … … 79 79 */ 80 80 psArray* psHashToArray( 81 psHash* table///< table to convert to psArray81 const psHash* table ///< table to convert to psArray 82 82 ); 83 83 -
branches/pap_branch_050513/psLib/src/types/psList.c
r3682 r3966 6 6 * @author Robert Daniel DeSonia, MHPCC 7 7 * 8 * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $9 * @date $Date: 2005-0 4-07 20:27:41$8 * @version $Revision: 1.35.4.1 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2005-05-19 01:09:56 $ 10 10 * 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 125 125 } 126 126 127 psList* psListAlloc( psPtr data)127 psList* psListAlloc(const psPtr data) 128 128 { 129 129 psList* list = psAlloc(sizeof(psList)); … … 247 247 } 248 248 249 psBool psListAdd(psList* list, psS32 location, psPtr data)249 psBool psListAdd(psList* list, psS32 location, const psPtr data) 250 250 { 251 251 … … 283 283 } 284 284 285 bool psListAddAfter(psListIterator* iterator, void* data)285 bool psListAddAfter(psListIterator* iterator, const void* data) 286 286 { 287 287 if (data == NULL) { … … 358 358 } 359 359 360 bool psListAddBefore(psListIterator* iterator, void* data)360 bool psListAddBefore(psListIterator* iterator, const void* data) 361 361 { 362 362 if (data == NULL) { … … 452 452 453 453 psBool psListRemoveData(psList* list, 454 psPtr data)454 const psPtr data) 455 455 { 456 456 if (list == NULL) { … … 564 564 * Convert a psList to/from a psVoidPtrArray 565 565 */ 566 psArray* psListToArray( psList* restrict list)566 psArray* psListToArray(const psList* restrict list) 567 567 { 568 568 psListElem* ptr; … … 592 592 } 593 593 594 psList* psArrayToList( psArray* arr)594 psList* psArrayToList(const psArray* arr) 595 595 { 596 596 psU32 n; -
branches/pap_branch_050513/psLib/src/types/psList.h
r3409 r3966 10 10 * @ingroup LinkedList 11 11 * 12 * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $13 * @date $Date: 2005-0 3-11 23:17:46 $12 * @version $Revision: 1.23.8.1 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-05-19 01:09:56 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 88 88 */ 89 89 psList* psListAlloc( 90 psPtr data90 const psPtr data 91 91 ///< initial data item; may be NULL if no an empty psList is desired 92 92 ) … … 121 121 psList* list, ///< list to add item to 122 122 psS32 location, ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location. 123 psPtr data///< data item to add. If NULL, list is not modified.123 const psPtr data ///< data item to add. If NULL, list is not modified. 124 124 ); 125 125 … … 130 130 psBool psListAddAfter( 131 131 psListIterator* list, ///< list position to add item to 132 psPtr data///< data item to add. If NULL, list is not modified.132 const psPtr data ///< data item to add. If NULL, list is not modified. 133 133 ); 134 134 … … 139 139 psBool psListAddBefore( 140 140 psListIterator* list, ///< list position to add item to 141 psPtr data///< data item to add. If NULL, list is not modified.141 const psPtr data ///< data item to add. If NULL, list is not modified. 142 142 ); 143 143 … … 157 157 psBool psListRemoveData( 158 158 psList* list, ///< list to remove element from 159 psPtr data///< data item to find and remove159 const psPtr data ///< data item to find and remove 160 160 ); 161 161 … … 196 196 */ 197 197 psArray* psListToArray( 198 psList* dlist///< List to convert198 const psList* dlist ///< List to convert 199 199 ); 200 200 … … 205 205 */ 206 206 psList* psArrayToList( 207 psArray* arr///< vector to convert207 const psArray* arr ///< vector to convert 208 208 ); 209 209 -
branches/pap_branch_050513/psLib/src/types/psMetadata.c
r3780 r3966 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.61 $ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 4-28 19:52:48$14 * @version $Revision: 1.61.2.1 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-05-19 01:09:56 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 240 240 } 241 241 242 psBool psMetadataAddItem(psMetadata *md, psMetadataItem *metadataItem, psS32 location, psS32 flags)242 psBool psMetadataAddItem(psMetadata *md, const psMetadataItem *metadataItem, psS32 location, psS32 flags) 243 243 { 244 244 char * key = NULL; … … 349 349 #define METADATA_ADD_TYPE(NAME,TYPE,METATYPE) \ 350 350 psBool psMetadataAdd##NAME(psMetadata* md, psS32 where, const char* name, \ 351 const char* comment, TYPE value) { \351 const char* comment, const TYPE value) { \ 352 352 return psMetadataAdd(md,where,name, METATYPE,comment,value); \ 353 353 } -
branches/pap_branch_050513/psLib/src/types/psMetadata.h
r3684 r3966 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $14 * @date $Date: 2005-0 4-08 17:58:57$13 * @version $Revision: 1.44.4.1 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-05-19 01:09:56 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 259 259 psBool psMetadataAddItem( 260 260 psMetadata* md, ///< Metadata collection to insert metadat item. 261 psMetadataItem* item,///< Metadata item to be added.261 const psMetadataItem* item, ///< Metadata item to be added. 262 262 psS32 location, ///< Location to be added. 263 263 psS32 flags ///< Options flag mask, see psMetadataFlags enum … … 303 303 const char* comment, psF64 value); 304 304 psBool psMetadataAddList(psMetadata* md, psS32 location, const char* name, 305 const char* comment, psList* value);305 const char* comment, const psList* value); 306 306 psBool psMetadataAddStr(psMetadata* md, psS32 location, const char* name, 307 307 const char* comment, const char* value); 308 308 psBool psMetadataAddVector(psMetadata* md, psS32 location, const char* name, 309 const char* comment, psVector* value);309 const char* comment, const psVector* value); 310 310 psBool psMetadataAddImage(psMetadata* md, psS32 location, const char* name, 311 const char* comment, psImage* value);311 const char* comment, const psImage* value); 312 312 psBool psMetadataAddHash(psMetadata* md, psS32 location, const char* name, 313 const char* comment, psHash* value);313 const char* comment, const psHash* value); 314 314 psBool psMetadataAddLookupTable(psMetadata* md, psS32 location, const char* name, 315 const char* comment, psLookupTable* value);315 const char* comment, const psLookupTable* value); 316 316 psBool psMetadataAddUnknown(psMetadata* md, psS32 location, const char* name, 317 const char* comment, psPtr value);317 const char* comment, const psPtr value); 318 318 319 319 /** Remove an item from metadata collection.
Note:
See TracChangeset
for help on using the changeset viewer.
