Index: /trunk/psLib/pslib.kdevses =================================================================== --- /trunk/psLib/pslib.kdevses (revision 4341) +++ /trunk/psLib/pslib.kdevses (revision 4342) @@ -2,14 +2,11 @@ - - - + + + - - + + - - - Index: /trunk/psLib/src/collections/psArray.c =================================================================== --- /trunk/psLib/src/collections/psArray.c (revision 4341) +++ /trunk/psLib/src/collections/psArray.c (revision 4342) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -49,5 +49,5 @@ FUNCTION IMPLEMENTATION - PUBLIC *****************************************************************************/ -psArray* psArrayAlloc(psU32 nalloc) +psArray* psArrayAlloc(unsigned long nalloc) { psArray* psArr = NULL; @@ -66,5 +66,5 @@ } -psArray* psArrayRealloc(psArray* in, psU32 nalloc) +psArray* psArrayRealloc(psArray* in, unsigned long nalloc) { if (in == NULL) { @@ -159,9 +159,9 @@ /// Set an element in the array. -psBool psArraySet(psArray* in, ///< input array to set element in - psU32 position, ///< the element position to set - void* value) ///< the value to set it to -{ - if (in == NULL) +bool psArraySet(psArray* array, ///< input array to set element in + unsigned long position, ///< the element position to set + psPtr data) ///< the value to set it to +{ + if (array == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, @@ -170,14 +170,14 @@ } - if (position >= in->nalloc) + if (position >= array->nalloc) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psArray_POSITION_BEYOND_NALLOC, - position, in->nalloc); + position, array->nalloc); return false; } - psFree(in->data[position]); - in->data[position] = value; + psFree(array->data[position]); + array->data[position] = data; return true; @@ -185,7 +185,7 @@ /// Get an element in the array. -void* psArrayGet(psArray* in, psU32 position ) -{ - if (in == NULL) { +psPtr psArrayGet(const psArray* array, unsigned long position ) +{ + if (array == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psArray_ARRAY_NULL); @@ -193,15 +193,15 @@ } - if (position >= in->nalloc) { + if (position >= array->nalloc) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psArray_POSITION_BEYOND_NALLOC, - position, in->nalloc); - return NULL; - } - - return in->data[position]; -} - - - - + position, array->nalloc); + return NULL; + } + + return array->data[position]; +} + + + + Index: /trunk/psLib/src/collections/psArray.h =================================================================== --- /trunk/psLib/src/collections/psArray.h (revision 4341) +++ /trunk/psLib/src/collections/psArray.h (revision 4342) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -34,7 +34,7 @@ typedef struct { - psU32 nalloc; ///< Total number of elements available. - psU32 n; ///< Number of elements in use. - psPtr* data; ///< An Array of pointer elements + psU32 nalloc; ///< Total number of elements available. + psU32 n; ///< Number of elements in use. + psPtr* data; ///< An Array of pointer elements } psArray; @@ -55,5 +55,5 @@ */ psArray* psArrayAlloc( - psU32 nalloc ///< Total number of elements to make available. + unsigned long nalloc ///< Total number of elements to make available. ); @@ -67,6 +67,6 @@ */ psArray* psArrayRealloc( - psArray* psArr, ///< array to reallocate. - psU32 nalloc ///< Total number of elements to make available. + psArray* array, ///< array to reallocate. + unsigned long nalloc ///< Total number of elements to make available. ); @@ -131,8 +131,8 @@ * @return psBool TRUE if the element was set successfully, otherwise FALSE */ -psBool psArraySet( - psArray* in, ///< input array to set element in - psU32 position, ///< the element position to set - void* value ///< the value to set it to +bool psArraySet( + psArray* array, ///< input array to set element in + unsigned long position, ///< the element position to set + psPtr data ///< the value to set it to ); @@ -141,7 +141,7 @@ * @return void* the element at given position. */ -void* psArrayGet( - psArray* in, ///< input array to get element from - psU32 position ///< the element position to get +psPtr psArrayGet( + const psArray* array, ///< input array to get element from + unsigned long position ///< the element position to get ); Index: /trunk/psLib/src/collections/psBitSet.c =================================================================== --- /trunk/psLib/src/collections/psBitSet.c (revision 4341) +++ /trunk/psLib/src/collections/psBitSet.c (revision 4342) @@ -11,6 +11,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -280,12 +280,12 @@ } -char *psBitSetToString(const psBitSet* inBitSet) +psString psBitSetToString(const psBitSet* bitSet) { psS32 i = 0; - psS32 numBits = inBitSet->n * 8; + psS32 numBits = bitSet->n * 8; char *outString = psAlloc((size_t) numBits + 1); for (i = 0; i < numBits; i++) { - outString[numBits - i - 1] = psBitSetTest(inBitSet, i) ? '1' : '0'; + outString[numBits - i - 1] = psBitSetTest(bitSet, i) ? '1' : '0'; } Index: /trunk/psLib/src/collections/psBitSet.h =================================================================== --- /trunk/psLib/src/collections/psBitSet.h (revision 4341) +++ /trunk/psLib/src/collections/psBitSet.h (revision 4342) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -137,6 +137,6 @@ */ -char *psBitSetToString( - const psBitSet* inMask ///< psBitSet to convert */ +psString psBitSetToString( + const psBitSet* bitSet ///< psBitSet to convert */ ); Index: /trunk/psLib/src/dataIO/psDB.c =================================================================== --- /trunk/psLib/src/dataIO/psDB.c (revision 4341) +++ /trunk/psLib/src/dataIO/psDB.c (revision 4342) @@ -12,6 +12,6 @@ * @author Joshua Hoblitt * - * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2005 Joshua Hoblitt, University of Hawaii @@ -45,14 +45,14 @@ // database utility functions -static inline bool psDBPackRow(MYSQL_BIND *bind, psMetadata *values, psU32 paramCount); +static inline bool psDBPackRow(MYSQL_BIND *bind, const psMetadata *values, psU32 paramCount); // SQL generation functions -static char *psDBGenerateCreateTableSQL(const char *tableName, psMetadata *where); -static char *psDBGenerateSelectRowSQL(const char *tableName, const char *col, psMetadata *where, psU64 limit); -static char *psDBGenerateInsertRowSQL(const char *tableName, psMetadata *row); -static char *psDBGenerateUpdateRowSQL(const char *tableName, psMetadata *where, psMetadata *values); -static char *psDBGenerateDeleteRowSQL(const char *tableName, psMetadata *where); -static char *psDBGenerateWhereSQL(psMetadata *where); -static char *psDBGenerateSetSQL(psMetadata *set +static char *psDBGenerateCreateTableSQL(const char *tableName, const psMetadata *where); +static char *psDBGenerateSelectRowSQL(const char *tableName, const char *col, const psMetadata *where, psU64 limit); +static char *psDBGenerateInsertRowSQL(const char *tableName, const psMetadata *row); +static char *psDBGenerateUpdateRowSQL(const char *tableName, const psMetadata *where, const psMetadata *values); +static char *psDBGenerateDeleteRowSQL(const char *tableName, const psMetadata *where); +static char *psDBGenerateWhereSQL(const psMetadata *where); +static char *psDBGenerateSetSQL(const psMetadata *set ); @@ -195,5 +195,5 @@ } -bool psDBCreateTable(psDB *dbh, const char *tableName, psMetadata *md) +bool psDBCreateTable(psDB *dbh, const char *tableName, const psMetadata *md) { char *query; @@ -403,5 +403,5 @@ } -psArray *psDBSelectRows(psDB *dbh, const char *tableName, psMetadata *where, unsigned long long limit) +psArray *psDBSelectRows(psDB *dbh, const char *tableName, const psMetadata *where, unsigned long long limit) { MYSQL_RES *result; // complete db result set @@ -509,7 +509,7 @@ } -bool psDBInsertOneRow(psDB *dbh, const char *tableName, psMetadata *row) -{ - psArray *rowSet; // psArray of row to insert +bool psDBInsertOneRow(psDB *dbh, const char *tableName, const psMetadata *row) +{ + psArray *rowSet; // psArray of row to insert // Check for null row @@ -522,5 +522,5 @@ rowSet = psArrayAlloc(1); rowSet->n = 0; - psArrayAdd(rowSet, 0, row); + psArrayAdd(rowSet, 0, (psPtr)row); // Execute function to insert rows @@ -687,5 +687,5 @@ } -psS64 psDBUpdateRows(psDB *dbh, const char *tableName, psMetadata *where, psMetadata *values) +psS64 psDBUpdateRows(psDB *dbh, const char *tableName, const psMetadata *where, const psMetadata *values) { char *query; @@ -769,5 +769,5 @@ } -psS64 psDBDeleteRows(psDB *dbh, const char *tableName, psMetadata *where) +psS64 psDBDeleteRows(psDB *dbh, const char *tableName, const psMetadata *where) { char *query; @@ -806,5 +806,5 @@ /*****************************************************************************/ -bool p_psDBRunQuery(psDB *dbh, const char *query) +bool p_psDBRunQuery(psDB *dbh, const char *format) { // Verify database object is not NULL @@ -815,5 +815,5 @@ // Run query - if (mysql_real_query(dbh->mysql, query, (unsigned long)strlen(query)) !=0) { + if (mysql_real_query(dbh->mysql, format, (unsigned long)strlen(format)) !=0) { psError(PS_ERR_UNKNOWN, true, PS_ERRORTEXT_psDB_SQL_QUERY_FAIL, mysql_error(dbh->mysql)); return false; @@ -823,5 +823,5 @@ } -static inline bool psDBPackRow(MYSQL_BIND *bind, psMetadata *values, psU32 paramCount) +static inline bool psDBPackRow(MYSQL_BIND *bind, const psMetadata *values, psU32 paramCount) { psListIterator *cursor; // row iterator @@ -912,5 +912,5 @@ /*****************************************************************************/ -static char *psDBGenerateCreateTableSQL(const char *tableName, psMetadata *table) +static char *psDBGenerateCreateTableSQL(const char *tableName, const psMetadata *table) { char *query = NULL; // complete query @@ -988,5 +988,5 @@ } -static char *psDBGenerateSelectRowSQL(const char *tableName, const char *col, psMetadata *where, const psU64 limit) +static char *psDBGenerateSelectRowSQL(const char *tableName, const char *col, const psMetadata *where, psU64 limit) { char *query = NULL; @@ -1025,5 +1025,5 @@ } -static char *psDBGenerateInsertRowSQL(const char *tableName, psMetadata *row) +static char *psDBGenerateInsertRowSQL(const char *tableName, const psMetadata *row) { char *query = NULL; @@ -1081,5 +1081,5 @@ } -static char *psDBGenerateUpdateRowSQL(const char *tableName, psMetadata *where, psMetadata *values) +static char *psDBGenerateUpdateRowSQL(const char *tableName, const psMetadata *where, const psMetadata *values) { char *query = NULL; @@ -1114,5 +1114,5 @@ } -static char *psDBGenerateDeleteRowSQL(const char *tableName, psMetadata *where) +static char *psDBGenerateDeleteRowSQL(const char *tableName, const psMetadata *where) { char *query = NULL; @@ -1139,5 +1139,5 @@ } -static char *psDBGenerateWhereSQL(psMetadata *where) +static char *psDBGenerateWhereSQL(const psMetadata *where) { char *query = NULL; @@ -1198,5 +1198,5 @@ } -static char *psDBGenerateSetSQL(psMetadata *set +static char *psDBGenerateSetSQL(const psMetadata *set ) { Index: /trunk/psLib/src/dataIO/psDB.h =================================================================== --- /trunk/psLib/src/dataIO/psDB.h (revision 4341) +++ /trunk/psLib/src/dataIO/psDB.h (revision 4342) @@ -10,6 +10,6 @@ * @author Joshua Hoblitt * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2005 Joshua Hoblitt, University of Hawaii @@ -93,5 +93,5 @@ bool p_psDBRunQuery( psDB *dbh, ///< Database handle - const char *query ///< SQL string to execute + const char *format ///< SQL string to execute ); @@ -119,5 +119,5 @@ psDB *dbh, ///< Database handle const char *tableName, ///< Table name - psMetadata *md ///< Column names, types, and indexes + const psMetadata *md ///< Column names, types, and indexes ); @@ -179,5 +179,5 @@ psDB *dbh, ///< Database handle const char *tableName, ///< Table name - psMetadata *where, ///< Row match criteria + const psMetadata *where, ///< Row match criteria unsigned long long limit ///< Maximum number of elements to return ); @@ -197,5 +197,5 @@ psDB *dbh, ///< Database handle const char *tableName, ///< Table name - psMetadata *row ///< Row description + const psMetadata *row ///< Row description ); @@ -254,6 +254,6 @@ psDB *dbh, ///< Database handle const char *tableName, ///< Table name - psMetadata *where, ///< Row match criteria - psMetadata *values ///< new field values + const psMetadata *where, ///< Row match criteria + const psMetadata *values ///< new field values ); @@ -271,5 +271,5 @@ psDB *dbh, ///< Database handle const char *tableName, ///< Table name - psMetadata *where ///< Row match criteria + const psMetadata *where ///< Row match criteria ); Index: /trunk/psLib/src/dataIO/psFits.c =================================================================== --- /trunk/psLib/src/dataIO/psFits.c (revision 4341) +++ /trunk/psLib/src/dataIO/psFits.c (revision 4342) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -336,5 +336,5 @@ } -char* psFitsGetExtName(const psFits* fits) +psString psFitsGetExtName(const psFits* fits) { if (fits == NULL) { Index: /trunk/psLib/src/dataIO/psFits.h =================================================================== --- /trunk/psLib/src/dataIO/psFits.h (revision 4341) +++ /trunk/psLib/src/dataIO/psFits.h (revision 4342) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -95,5 +95,5 @@ * error occurred. */ -char* psFitsGetExtName( +psString psFitsGetExtName( const psFits* fits ///< the psFits object ); Index: /trunk/psLib/src/dataManip/psBinaryOp.c =================================================================== --- /trunk/psLib/src/dataManip/psBinaryOp.c (revision 4341) +++ /trunk/psLib/src/dataManip/psBinaryOp.c (revision 4342) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 20:26:55 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -426,5 +426,5 @@ } -psPtr psBinaryOp(psPtr out, psPtr in1, char *op, psPtr in2) +psPtr psBinaryOp(psPtr out, const psPtr in1, const char *op, const psPtr in2) { Index: /trunk/psLib/src/dataManip/psBinaryOp.h =================================================================== --- /trunk/psLib/src/dataManip/psBinaryOp.h (revision 4341) +++ /trunk/psLib/src/dataManip/psBinaryOp.h (revision 4342) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -57,7 +57,7 @@ psType* psBinaryOp( psPtr out, ///< Output type, either psImage or psVector. - psPtr in1, ///< First input, either psImage or psVector. - char *op, ///< Operator. - psPtr in2 ///< Second input, either psImage or psVector. + const psPtr in1, ///< First input, either psImage or psVector. + const char *op, ///< Operator. + const psPtr in2 ///< Second input, either psImage or psVector. ); Index: /trunk/psLib/src/db/psDB.c =================================================================== --- /trunk/psLib/src/db/psDB.c (revision 4341) +++ /trunk/psLib/src/db/psDB.c (revision 4342) @@ -12,6 +12,6 @@ * @author Joshua Hoblitt * - * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2005 Joshua Hoblitt, University of Hawaii @@ -45,14 +45,14 @@ // database utility functions -static inline bool psDBPackRow(MYSQL_BIND *bind, psMetadata *values, psU32 paramCount); +static inline bool psDBPackRow(MYSQL_BIND *bind, const psMetadata *values, psU32 paramCount); // SQL generation functions -static char *psDBGenerateCreateTableSQL(const char *tableName, psMetadata *where); -static char *psDBGenerateSelectRowSQL(const char *tableName, const char *col, psMetadata *where, psU64 limit); -static char *psDBGenerateInsertRowSQL(const char *tableName, psMetadata *row); -static char *psDBGenerateUpdateRowSQL(const char *tableName, psMetadata *where, psMetadata *values); -static char *psDBGenerateDeleteRowSQL(const char *tableName, psMetadata *where); -static char *psDBGenerateWhereSQL(psMetadata *where); -static char *psDBGenerateSetSQL(psMetadata *set +static char *psDBGenerateCreateTableSQL(const char *tableName, const psMetadata *where); +static char *psDBGenerateSelectRowSQL(const char *tableName, const char *col, const psMetadata *where, psU64 limit); +static char *psDBGenerateInsertRowSQL(const char *tableName, const psMetadata *row); +static char *psDBGenerateUpdateRowSQL(const char *tableName, const psMetadata *where, const psMetadata *values); +static char *psDBGenerateDeleteRowSQL(const char *tableName, const psMetadata *where); +static char *psDBGenerateWhereSQL(const psMetadata *where); +static char *psDBGenerateSetSQL(const psMetadata *set ); @@ -195,5 +195,5 @@ } -bool psDBCreateTable(psDB *dbh, const char *tableName, psMetadata *md) +bool psDBCreateTable(psDB *dbh, const char *tableName, const psMetadata *md) { char *query; @@ -403,5 +403,5 @@ } -psArray *psDBSelectRows(psDB *dbh, const char *tableName, psMetadata *where, unsigned long long limit) +psArray *psDBSelectRows(psDB *dbh, const char *tableName, const psMetadata *where, unsigned long long limit) { MYSQL_RES *result; // complete db result set @@ -509,7 +509,7 @@ } -bool psDBInsertOneRow(psDB *dbh, const char *tableName, psMetadata *row) -{ - psArray *rowSet; // psArray of row to insert +bool psDBInsertOneRow(psDB *dbh, const char *tableName, const psMetadata *row) +{ + psArray *rowSet; // psArray of row to insert // Check for null row @@ -522,5 +522,5 @@ rowSet = psArrayAlloc(1); rowSet->n = 0; - psArrayAdd(rowSet, 0, row); + psArrayAdd(rowSet, 0, (psPtr)row); // Execute function to insert rows @@ -687,5 +687,5 @@ } -psS64 psDBUpdateRows(psDB *dbh, const char *tableName, psMetadata *where, psMetadata *values) +psS64 psDBUpdateRows(psDB *dbh, const char *tableName, const psMetadata *where, const psMetadata *values) { char *query; @@ -769,5 +769,5 @@ } -psS64 psDBDeleteRows(psDB *dbh, const char *tableName, psMetadata *where) +psS64 psDBDeleteRows(psDB *dbh, const char *tableName, const psMetadata *where) { char *query; @@ -806,5 +806,5 @@ /*****************************************************************************/ -bool p_psDBRunQuery(psDB *dbh, const char *query) +bool p_psDBRunQuery(psDB *dbh, const char *format) { // Verify database object is not NULL @@ -815,5 +815,5 @@ // Run query - if (mysql_real_query(dbh->mysql, query, (unsigned long)strlen(query)) !=0) { + if (mysql_real_query(dbh->mysql, format, (unsigned long)strlen(format)) !=0) { psError(PS_ERR_UNKNOWN, true, PS_ERRORTEXT_psDB_SQL_QUERY_FAIL, mysql_error(dbh->mysql)); return false; @@ -823,5 +823,5 @@ } -static inline bool psDBPackRow(MYSQL_BIND *bind, psMetadata *values, psU32 paramCount) +static inline bool psDBPackRow(MYSQL_BIND *bind, const psMetadata *values, psU32 paramCount) { psListIterator *cursor; // row iterator @@ -912,5 +912,5 @@ /*****************************************************************************/ -static char *psDBGenerateCreateTableSQL(const char *tableName, psMetadata *table) +static char *psDBGenerateCreateTableSQL(const char *tableName, const psMetadata *table) { char *query = NULL; // complete query @@ -988,5 +988,5 @@ } -static char *psDBGenerateSelectRowSQL(const char *tableName, const char *col, psMetadata *where, const psU64 limit) +static char *psDBGenerateSelectRowSQL(const char *tableName, const char *col, const psMetadata *where, psU64 limit) { char *query = NULL; @@ -1025,5 +1025,5 @@ } -static char *psDBGenerateInsertRowSQL(const char *tableName, psMetadata *row) +static char *psDBGenerateInsertRowSQL(const char *tableName, const psMetadata *row) { char *query = NULL; @@ -1081,5 +1081,5 @@ } -static char *psDBGenerateUpdateRowSQL(const char *tableName, psMetadata *where, psMetadata *values) +static char *psDBGenerateUpdateRowSQL(const char *tableName, const psMetadata *where, const psMetadata *values) { char *query = NULL; @@ -1114,5 +1114,5 @@ } -static char *psDBGenerateDeleteRowSQL(const char *tableName, psMetadata *where) +static char *psDBGenerateDeleteRowSQL(const char *tableName, const psMetadata *where) { char *query = NULL; @@ -1139,5 +1139,5 @@ } -static char *psDBGenerateWhereSQL(psMetadata *where) +static char *psDBGenerateWhereSQL(const psMetadata *where) { char *query = NULL; @@ -1198,5 +1198,5 @@ } -static char *psDBGenerateSetSQL(psMetadata *set +static char *psDBGenerateSetSQL(const psMetadata *set ) { Index: /trunk/psLib/src/db/psDB.h =================================================================== --- /trunk/psLib/src/db/psDB.h (revision 4341) +++ /trunk/psLib/src/db/psDB.h (revision 4342) @@ -10,6 +10,6 @@ * @author Joshua Hoblitt * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2005 Joshua Hoblitt, University of Hawaii @@ -93,5 +93,5 @@ bool p_psDBRunQuery( psDB *dbh, ///< Database handle - const char *query ///< SQL string to execute + const char *format ///< SQL string to execute ); @@ -119,5 +119,5 @@ psDB *dbh, ///< Database handle const char *tableName, ///< Table name - psMetadata *md ///< Column names, types, and indexes + const psMetadata *md ///< Column names, types, and indexes ); @@ -179,5 +179,5 @@ psDB *dbh, ///< Database handle const char *tableName, ///< Table name - psMetadata *where, ///< Row match criteria + const psMetadata *where, ///< Row match criteria unsigned long long limit ///< Maximum number of elements to return ); @@ -197,5 +197,5 @@ psDB *dbh, ///< Database handle const char *tableName, ///< Table name - psMetadata *row ///< Row description + const psMetadata *row ///< Row description ); @@ -254,6 +254,6 @@ psDB *dbh, ///< Database handle const char *tableName, ///< Table name - psMetadata *where, ///< Row match criteria - psMetadata *values ///< new field values + const psMetadata *where, ///< Row match criteria + const psMetadata *values ///< new field values ); @@ -271,5 +271,5 @@ psDB *dbh, ///< Database handle const char *tableName, ///< Table name - psMetadata *where ///< Row match criteria + const psMetadata *where ///< Row match criteria ); Index: /trunk/psLib/src/fits/psFits.c =================================================================== --- /trunk/psLib/src/fits/psFits.c (revision 4341) +++ /trunk/psLib/src/fits/psFits.c (revision 4342) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -336,5 +336,5 @@ } -char* psFitsGetExtName(const psFits* fits) +psString psFitsGetExtName(const psFits* fits) { if (fits == NULL) { Index: /trunk/psLib/src/fits/psFits.h =================================================================== --- /trunk/psLib/src/fits/psFits.h (revision 4341) +++ /trunk/psLib/src/fits/psFits.h (revision 4342) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -95,5 +95,5 @@ * error occurred. */ -char* psFitsGetExtName( +psString psFitsGetExtName( const psFits* fits ///< the psFits object ); Index: /trunk/psLib/src/math/psBinaryOp.c =================================================================== --- /trunk/psLib/src/math/psBinaryOp.c (revision 4341) +++ /trunk/psLib/src/math/psBinaryOp.c (revision 4342) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 20:26:55 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -426,5 +426,5 @@ } -psPtr psBinaryOp(psPtr out, psPtr in1, char *op, psPtr in2) +psPtr psBinaryOp(psPtr out, const psPtr in1, const char *op, const psPtr in2) { Index: /trunk/psLib/src/math/psBinaryOp.h =================================================================== --- /trunk/psLib/src/math/psBinaryOp.h (revision 4341) +++ /trunk/psLib/src/math/psBinaryOp.h (revision 4342) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -57,7 +57,7 @@ psType* psBinaryOp( psPtr out, ///< Output type, either psImage or psVector. - psPtr in1, ///< First input, either psImage or psVector. - char *op, ///< Operator. - psPtr in2 ///< Second input, either psImage or psVector. + const psPtr in1, ///< First input, either psImage or psVector. + const char *op, ///< Operator. + const psPtr in2 ///< Second input, either psImage or psVector. ); Index: /trunk/psLib/src/sys/psError.c =================================================================== --- /trunk/psLib/src/sys/psError.c (revision 4341) +++ /trunk/psLib/src/sys/psError.c (revision 4342) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:50 $ + * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,10 +67,10 @@ } -psErrorCode p_psError(const char* file, - int lineno, +psErrorCode p_psError(const char* filename, + unsigned int lineno, const char* func, psErrorCode code, - psBool new, - const char* fmt, + bool new, + const char* format, ...) { @@ -79,5 +79,5 @@ char msgName[1024]; - snprintf(msgName,1024,"%s (%s:%d)",func,file,lineno); + snprintf(msgName,1024,"%s (%s:%d)",func,filename,lineno); va_list argPtr; // variable list arguement pointer @@ -88,7 +88,7 @@ // Get the variable list parameters to pass to logging function - va_start(argPtr, fmt); - - vsnprintf(errMsg,2048,fmt,argPtr); + va_start(argPtr, format); + + vsnprintf(errMsg,2048,format,argPtr); err = psErrAlloc(msgName,code,errMsg); pushErrorStack(err); Index: /trunk/psLib/src/sys/psError.h =================================================================== --- /trunk/psLib/src/sys/psError.h (revision 4341) +++ /trunk/psLib/src/sys/psError.h (revision 4342) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:50 $ + * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -148,10 +148,10 @@ */ psErrorCode p_psError( - const char* file, ///< file name - int lineno, ///< line number in file + const char* filename, ///< file name + unsigned int lineno, ///< line number in file const char* func, ///< function name psErrorCode code, ///< Error class code - psBool new, ///< true if error originates at this location - const char* fmt, ///< printf-style format of header line + bool new, ///< true if error originates at this location + const char* format, ///< printf-style format of header line ... ///< any parameters required in fmt ); Index: /trunk/psLib/src/sys/psType.h =================================================================== --- /trunk/psLib/src/sys/psType.h (revision 4341) +++ /trunk/psLib/src/sys/psType.h (revision 4342) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-17 00:11:08 $ +* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -71,4 +71,5 @@ #endif // !SWIG +typedef char* psString; ///< string value typedef void* psPtr; ///< void pointer typedef bool psBool; ///< boolean value Index: /trunk/psLib/src/sysUtils/psError.c =================================================================== --- /trunk/psLib/src/sysUtils/psError.c (revision 4341) +++ /trunk/psLib/src/sysUtils/psError.c (revision 4342) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:50 $ + * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,10 +67,10 @@ } -psErrorCode p_psError(const char* file, - int lineno, +psErrorCode p_psError(const char* filename, + unsigned int lineno, const char* func, psErrorCode code, - psBool new, - const char* fmt, + bool new, + const char* format, ...) { @@ -79,5 +79,5 @@ char msgName[1024]; - snprintf(msgName,1024,"%s (%s:%d)",func,file,lineno); + snprintf(msgName,1024,"%s (%s:%d)",func,filename,lineno); va_list argPtr; // variable list arguement pointer @@ -88,7 +88,7 @@ // Get the variable list parameters to pass to logging function - va_start(argPtr, fmt); - - vsnprintf(errMsg,2048,fmt,argPtr); + va_start(argPtr, format); + + vsnprintf(errMsg,2048,format,argPtr); err = psErrAlloc(msgName,code,errMsg); pushErrorStack(err); Index: /trunk/psLib/src/sysUtils/psError.h =================================================================== --- /trunk/psLib/src/sysUtils/psError.h (revision 4341) +++ /trunk/psLib/src/sysUtils/psError.h (revision 4342) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:50 $ + * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -148,10 +148,10 @@ */ psErrorCode p_psError( - const char* file, ///< file name - int lineno, ///< line number in file + const char* filename, ///< file name + unsigned int lineno, ///< line number in file const char* func, ///< function name psErrorCode code, ///< Error class code - psBool new, ///< true if error originates at this location - const char* fmt, ///< printf-style format of header line + bool new, ///< true if error originates at this location + const char* format, ///< printf-style format of header line ... ///< any parameters required in fmt ); Index: /trunk/psLib/src/sysUtils/psType.h =================================================================== --- /trunk/psLib/src/sysUtils/psType.h (revision 4341) +++ /trunk/psLib/src/sysUtils/psType.h (revision 4342) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-17 00:11:08 $ +* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -71,4 +71,5 @@ #endif // !SWIG +typedef char* psString; ///< string value typedef void* psPtr; ///< void pointer typedef bool psBool; ///< boolean value Index: /trunk/psLib/src/types/psArray.c =================================================================== --- /trunk/psLib/src/types/psArray.c (revision 4341) +++ /trunk/psLib/src/types/psArray.c (revision 4342) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -49,5 +49,5 @@ FUNCTION IMPLEMENTATION - PUBLIC *****************************************************************************/ -psArray* psArrayAlloc(psU32 nalloc) +psArray* psArrayAlloc(unsigned long nalloc) { psArray* psArr = NULL; @@ -66,5 +66,5 @@ } -psArray* psArrayRealloc(psArray* in, psU32 nalloc) +psArray* psArrayRealloc(psArray* in, unsigned long nalloc) { if (in == NULL) { @@ -159,9 +159,9 @@ /// Set an element in the array. -psBool psArraySet(psArray* in, ///< input array to set element in - psU32 position, ///< the element position to set - void* value) ///< the value to set it to -{ - if (in == NULL) +bool psArraySet(psArray* array, ///< input array to set element in + unsigned long position, ///< the element position to set + psPtr data) ///< the value to set it to +{ + if (array == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, @@ -170,14 +170,14 @@ } - if (position >= in->nalloc) + if (position >= array->nalloc) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psArray_POSITION_BEYOND_NALLOC, - position, in->nalloc); + position, array->nalloc); return false; } - psFree(in->data[position]); - in->data[position] = value; + psFree(array->data[position]); + array->data[position] = data; return true; @@ -185,7 +185,7 @@ /// Get an element in the array. -void* psArrayGet(psArray* in, psU32 position ) -{ - if (in == NULL) { +psPtr psArrayGet(const psArray* array, unsigned long position ) +{ + if (array == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psArray_ARRAY_NULL); @@ -193,15 +193,15 @@ } - if (position >= in->nalloc) { + if (position >= array->nalloc) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psArray_POSITION_BEYOND_NALLOC, - position, in->nalloc); - return NULL; - } - - return in->data[position]; -} - - - - + position, array->nalloc); + return NULL; + } + + return array->data[position]; +} + + + + Index: /trunk/psLib/src/types/psArray.h =================================================================== --- /trunk/psLib/src/types/psArray.h (revision 4341) +++ /trunk/psLib/src/types/psArray.h (revision 4342) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -34,7 +34,7 @@ typedef struct { - psU32 nalloc; ///< Total number of elements available. - psU32 n; ///< Number of elements in use. - psPtr* data; ///< An Array of pointer elements + psU32 nalloc; ///< Total number of elements available. + psU32 n; ///< Number of elements in use. + psPtr* data; ///< An Array of pointer elements } psArray; @@ -55,5 +55,5 @@ */ psArray* psArrayAlloc( - psU32 nalloc ///< Total number of elements to make available. + unsigned long nalloc ///< Total number of elements to make available. ); @@ -67,6 +67,6 @@ */ psArray* psArrayRealloc( - psArray* psArr, ///< array to reallocate. - psU32 nalloc ///< Total number of elements to make available. + psArray* array, ///< array to reallocate. + unsigned long nalloc ///< Total number of elements to make available. ); @@ -131,8 +131,8 @@ * @return psBool TRUE if the element was set successfully, otherwise FALSE */ -psBool psArraySet( - psArray* in, ///< input array to set element in - psU32 position, ///< the element position to set - void* value ///< the value to set it to +bool psArraySet( + psArray* array, ///< input array to set element in + unsigned long position, ///< the element position to set + psPtr data ///< the value to set it to ); @@ -141,7 +141,7 @@ * @return void* the element at given position. */ -void* psArrayGet( - psArray* in, ///< input array to get element from - psU32 position ///< the element position to get +psPtr psArrayGet( + const psArray* array, ///< input array to get element from + unsigned long position ///< the element position to get ); Index: /trunk/psLib/src/types/psBitSet.c =================================================================== --- /trunk/psLib/src/types/psBitSet.c (revision 4341) +++ /trunk/psLib/src/types/psBitSet.c (revision 4342) @@ -11,6 +11,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -280,12 +280,12 @@ } -char *psBitSetToString(const psBitSet* inBitSet) +psString psBitSetToString(const psBitSet* bitSet) { psS32 i = 0; - psS32 numBits = inBitSet->n * 8; + psS32 numBits = bitSet->n * 8; char *outString = psAlloc((size_t) numBits + 1); for (i = 0; i < numBits; i++) { - outString[numBits - i - 1] = psBitSetTest(inBitSet, i) ? '1' : '0'; + outString[numBits - i - 1] = psBitSetTest(bitSet, i) ? '1' : '0'; } Index: /trunk/psLib/src/types/psBitSet.h =================================================================== --- /trunk/psLib/src/types/psBitSet.h (revision 4341) +++ /trunk/psLib/src/types/psBitSet.h (revision 4342) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-22 02:05:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -137,6 +137,6 @@ */ -char *psBitSetToString( - const psBitSet* inMask ///< psBitSet to convert */ +psString psBitSetToString( + const psBitSet* bitSet ///< psBitSet to convert */ );