Index: trunk/psLib/src/db/psDB.c
===================================================================
--- trunk/psLib/src/db/psDB.c	(revision 4556)
+++ trunk/psLib/src/db/psDB.c	(revision 4589)
@@ -12,6 +12,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-15 02:33:52 $
+ *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-21 01:40:10 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -49,8 +49,11 @@
 // SQL generation functions
 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    *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, unsigned long long limit);
+static char    *psDBGenerateUpdateRowSQL(const char *tableName, const psMetadata *where,
+        const psMetadata *values);
+static char    *psDBGenerateDeleteRowSQL(const char *tableName, const psMetadata *where,
+        unsigned long long limit);
 static char    *psDBGenerateWhereSQL(const psMetadata *where);
 static char    *psDBGenerateSetSQL(const psMetadata *set
@@ -89,5 +92,8 @@
 /*****************************************************************************/
 
-psDB *psDBInit(const char *host, const char *user, const char *passwd, const char *dbname)
+psDB *psDBInit(const char *host,
+               const char *user,
+               const char *passwd,
+               const char *dbname)
 {
     MYSQL           *mysql;
@@ -139,5 +145,6 @@
 }
 
-bool psDBCreate(psDB *dbh, const char *dbname)
+bool psDBCreate(psDB *dbh,
+                const char *dbname)
 {
     char            *query = NULL;
@@ -157,5 +164,6 @@
 }
 
-bool psDBChange(psDB *dbh, const char *dbname)
+bool psDBChange(psDB *dbh,
+                const char *dbname)
 {
     // Verify database object is valid
@@ -177,5 +185,6 @@
 }
 
-bool psDBDrop(psDB *dbh, const char *dbname)
+bool psDBDrop(psDB *dbh,
+              const char *dbname)
 {
     char            *query = NULL;
@@ -195,5 +204,7 @@
 }
 
-bool psDBCreateTable(psDB *dbh, const char *tableName, const psMetadata *md)
+bool psDBCreateTable(psDB *dbh,
+                     const char *tableName,
+                     const psMetadata *md)
 {
     char            *query;
@@ -225,5 +236,6 @@
 }
 
-bool psDBDropTable(psDB *dbh, const char *tableName)
+bool psDBDropTable(psDB *dbh,
+                   const char *tableName)
 {
     char            *query = NULL;
@@ -244,5 +256,8 @@
 }
 
-psArray *psDBSelectColumn(psDB *dbh, const char *tableName, const char *col, unsigned long long limit)
+psArray *psDBSelectColumn(psDB *dbh,
+                          const char *tableName,
+                          const char *col,
+                          unsigned long long limit)
 {
     MYSQL_RES       *result;            // complete db result set
@@ -339,5 +354,9 @@
 }
 
-psVector *psDBSelectColumnNum(psDB *dbh, const char *tableName, const char *col, psElemType type, unsigned long long limit)
+psVector *psDBSelectColumnNum(psDB *dbh,
+                              const char *tableName,
+                              const char *col,
+                              psElemType type,
+                              unsigned long long limit)
 {
     psArray         *stringColumn;      // source psArray
@@ -403,5 +422,8 @@
 }
 
-psArray *psDBSelectRows(psDB *dbh, const char *tableName, const 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
@@ -507,5 +529,7 @@
 }
 
-bool psDBInsertOneRow(psDB *dbh, const char *tableName, const psMetadata *row)
+bool psDBInsertOneRow(psDB *dbh,
+                      const char *tableName,
+                      const psMetadata *row)
 {
     psArray         *rowSet;           // psArray of row to insert
@@ -534,5 +558,7 @@
 }
 
-bool psDBInsertRows(psDB *dbh, const char *tableName, const psArray *rowSet)
+bool psDBInsertRows(psDB *dbh,
+                    const char *tableName,
+                    const psArray *rowSet)
 {
     psMetadata      *row;               // row of data
@@ -635,10 +661,12 @@
 }
 
-psArray *psDBDumpRows(psDB *dbh, const char *tableName)
+psArray *psDBDumpRows(psDB *dbh,
+                      const char *tableName)
 {
     return psDBSelectRows(dbh, tableName, NULL, 0);
 }
 
-psMetadata *psDBDumpCols(psDB *dbh, const char *tableName)
+psMetadata *psDBDumpCols(psDB *dbh,
+                         const char *tableName)
 {
     MYSQL_RES       *result;
@@ -698,5 +726,8 @@
 }
 
-psS64 psDBUpdateRows(psDB *dbh, const char *tableName, const psMetadata *where, const psMetadata *values)
+long psDBUpdateRows(psDB *dbh,
+                    const char *tableName,
+                    const psMetadata *where,
+                    const psMetadata *values)
 {
     char            *query;
@@ -779,5 +810,8 @@
 }
 
-psS64 psDBDeleteRows(psDB *dbh, const char *tableName, const psMetadata *where, unsigned long long limit)
+long psDBDeleteRows(psDB *dbh,
+                    const char *tableName,
+                    const psMetadata *where,
+                    unsigned long long limit)
 {
     char            *query;
@@ -818,5 +852,6 @@
 /*****************************************************************************/
 
-bool p_psDBRunQuery(psDB *dbh, const char *format)
+bool p_psDBRunQuery(psDB *dbh,
+                    const char *format)
 {
     // Verify database object is not NULL
@@ -835,5 +870,7 @@
 }
 
-static inline bool psDBPackRow(MYSQL_BIND *bind, const psMetadata *values, psU32 paramCount)
+static inline bool psDBPackRow(MYSQL_BIND *bind,
+                               const psMetadata *values,
+                               psU32 paramCount)
 {
     psListIterator  *cursor;            // row iterator
@@ -928,5 +965,6 @@
 /*****************************************************************************/
 
-static char *psDBGenerateCreateTableSQL(const char *tableName, const psMetadata *table)
+static char *psDBGenerateCreateTableSQL(const char *tableName,
+                                        const psMetadata *table)
 {
     char            *query = NULL;      // complete query
@@ -1004,5 +1042,8 @@
 }
 
-static char *psDBGenerateSelectRowSQL(const char *tableName, const char *col, const psMetadata *where, psU64 limit)
+static char *psDBGenerateSelectRowSQL(const char *tableName,
+                                      const char *col,
+                                      const psMetadata *where,
+                                      psU64 limit)
 {
     char            *query = NULL;
@@ -1041,5 +1082,6 @@
 }
 
-static char *psDBGenerateInsertRowSQL(const char *tableName, const psMetadata *row)
+static char *psDBGenerateInsertRowSQL(const char *tableName,
+                                      const psMetadata *row)
 {
     char            *query = NULL;
@@ -1097,5 +1139,7 @@
 }
 
-static char *psDBGenerateUpdateRowSQL(const char *tableName, const psMetadata *where, const psMetadata *values)
+static char *psDBGenerateUpdateRowSQL(const char *tableName,
+                                      const psMetadata *where,
+                                      const psMetadata *values)
 {
     char            *query = NULL;
@@ -1131,5 +1175,7 @@
 }
 
-static char *psDBGenerateDeleteRowSQL(const char *tableName, const psMetadata *where, unsigned long long limit)
+static char *psDBGenerateDeleteRowSQL(const char *tableName,
+                                      const psMetadata *where,
+                                      unsigned long long limit)
 {
     char            *query = NULL;
@@ -1261,5 +1307,6 @@
 /*****************************************************************************/
 
-static psElemType psDBMySQLToPType(enum enum_field_types type, unsigned int flags)
+static psElemType psDBMySQLToPType(enum enum_field_types type,
+                                   unsigned int flags)
 {
     psHash          *mysqlToSQLTable;   // type lookup table
@@ -1550,5 +1597,6 @@
 }
 
-static psPtr psDBMySQLTypeAlloc(enum enum_field_types type, bool isUnsigned)
+static psPtr psDBMySQLTypeAlloc(enum enum_field_types type,
+                                bool isUnsigned)
 {
     mysqlType       *mType;
@@ -1561,5 +1609,7 @@
 }
 
-static void psDBAddToLookupTable(psHash *lookupTable, psU32 type, const char *string)
+static void psDBAddToLookupTable(psHash *lookupTable,
+                                 psU32 type,
+                                 const char *string)
 {
     char            *key;
@@ -1575,5 +1625,7 @@
 }
 
-static void psDBAddVoidToLookupTable(psHash *lookupTable, psU32 type, psPtr value)
+static void psDBAddVoidToLookupTable(psHash *lookupTable,
+                                     psU32 type,
+                                     psPtr value)
 {
     char            *key;
@@ -1650,5 +1702,6 @@
 #define PS_IS_NAN(type, data, nan) *(type *)data == nan
 
-static bool psDBIsPTypeNaN(psElemType pType, psPtr data)
+static bool psDBIsPTypeNaN(psElemType pType,
+                           psPtr data)
 {
     bool    isNaN;
Index: trunk/psLib/src/db/psDB.h
===================================================================
--- trunk/psLib/src/db/psDB.h	(revision 4556)
+++ trunk/psLib/src/db/psDB.h	(revision 4589)
@@ -10,6 +10,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:12:00 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-21 01:40:10 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -40,5 +40,5 @@
 /** Opens a new database connection
  *
- *  @return A new psDB object if the database connection is successful or NULL on
+ *  @return psDB*:      A new psDB object if the database connection is successful or NULL on
  *  failure.
  */
@@ -50,6 +50,5 @@
 );
 
-/** Closes a database connection
- */
+/** Closes a database connection  */
 void psDBCleanup(
     psDB *dbh                          ///< Database handle
@@ -58,5 +57,5 @@
 /** Creates a new database namespace
  *
- * @return true on success
+ * @return bool:    true on success
  */
 bool psDBCreate(
@@ -67,5 +66,5 @@
 /** Changes the current database namespace
  *
- * @return true on success
+ * @return bool:    true on success
  */
 bool psDBChange(
@@ -76,5 +75,5 @@
 /** Drops a database namespace
  *
- * @return true on success
+ * @return bool:    true on success
  */
 bool psDBDrop(
@@ -89,5 +88,5 @@
  * dialect is provided.  Caveat emptor.
  *
- * @return true on success
+ * @return bool:    true on success
  */
 bool p_psDBRunQuery(
@@ -114,5 +113,5 @@
  * Key" or "Key".  Comments are otherwise ignored.
  *
- * @return true on success
+ * @return bool:    true on success
  */
 bool psDBCreateTable(
@@ -124,5 +123,5 @@
 /** Deletes a database table
  *
- * @return true on success
+ * @return bool:    true on success
 */
 bool psDBDropTable(
@@ -137,5 +136,5 @@
  * entire range is returned.
  *
- * @return A psArray of strings or NULL on failure
+ * @return psArray*:    A psArray of strings or NULL on failure
  */
 psArray *psDBSelectColumn(
@@ -152,5 +151,5 @@
  * entire range is returned.  The data in the column is cast to to "pType".
  *
- * @return A psVector or NULL on failure
+ * @return psVector*:   A psVector or NULL on failure
  */
 psVector *psDBSelectColumnNum(
@@ -174,5 +173,5 @@
  * string, e.g. "", to match NULL field values.
  *
- * @return A psArray of psMetadata or NULL on failure
+ * @return psArray*:    A psArray of psMetadata or NULL on failure
  */
 psArray *psDBSelectRows(
@@ -192,5 +191,5 @@
  * specified in "row" that do not exist in "tableName", the insert will fail.
  *
- * @return true on success
+ * @return bool:    true on success
  */
 bool psDBInsertOneRow(
@@ -207,5 +206,5 @@
  * those used in psDBInsertOneRow().
  *
- * @return true on success
+ * @return bool:    true on success
  */
 bool psDBInsertRows(
@@ -220,5 +219,5 @@
  * the same psMetadata format as used in psDBInsertOneRow() & psDBInsertRows().
  *
- * @return A psArray of psMetadata or NULL on failure
+ * @return psArray*:    A psArray of psMetadata or NULL on failure
  */
 psArray *psDBDumpRows(
@@ -233,5 +232,5 @@
  * psMetadata structure where psMetadataItem.name contains the column's name.
  *
- * @return A psMetadata containing either a psArrays or psVector per column
+ * @return psMetadata*:     A psMetadata containing either a psArrays or psVector per column
  */
 psMetadata *psDBDumpCols(
@@ -249,7 +248,7 @@
  * used in psDBInsertOneRow(), etc.
  *
- * @return The number of rows modified or a negative value on error
- */
-psS64 psDBUpdateRows(
+ * @return long:    The number of rows modified or a negative value on error
+ */
+long psDBUpdateRows(
     psDB *dbh,                         ///< Database handle
     const char *tableName,             ///< Table name
@@ -266,7 +265,7 @@
  * the number of rows that were dropped, only 1 will be returned on success.
  *
- * @return The number of rows removed or a negative value on error
- */
-psS64 psDBDeleteRows(
+ * @return long:    The number of rows removed or a negative value on error
+ */
+long psDBDeleteRows(
     psDB *dbh,                         ///< Database handle
     const char *tableName,             ///< Table name