Index: /trunk/psLib/src/astronomy/psDB.c =================================================================== --- /trunk/psLib/src/astronomy/psDB.c (revision 3570) +++ /trunk/psLib/src/astronomy/psDB.c (revision 3571) @@ -12,6 +12,6 @@ * @author Joshua Hoblitt * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-30 23:07:45 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-03-30 23:25:18 $ * * Copyright 2005 Joshua Hoblitt, University of Hawaii @@ -217,6 +217,6 @@ MYSQL_ROW row; // single row of db result set char *query; // SQL query - psU64 rowCount; // number of rows in db result set - psU64 dataSize; // size of field + my_ulonglong rowCount; // number of rows in db result set + unsigned long dataSize; // size of field unsigned int fieldCount; // number of fields in db result set psArray *column = NULL; // return array @@ -250,5 +250,5 @@ } - rowCount = (psU64)mysql_num_rows(result); + rowCount = mysql_num_rows(result); // pre-allocate enough elements to hold the complete result set @@ -261,5 +261,5 @@ // get the first element of lengths array that is part of the // result set - dataSize = (psU64)*mysql_fetch_lengths(result); + dataSize = *(mysql_fetch_lengths(result)); // represent NULL as an empty string @@ -372,7 +372,7 @@ MYSQL_FIELD *field; // field type info char *query; // SQL query - psU64 rowCount; // number of rows in db result set - psU64 fieldCount; // number of fields in db result set - long *fieldLength; // field sizes + my_ulonglong rowCount; // number of rows in db result set + unsigned int fieldCount; // number of fields in db result set + unsigned long *fieldLength; // field sizes long len; // field length psArray *resultSet; // return array @@ -413,5 +413,5 @@ } - rowCount = (psU64)mysql_num_rows(result); + rowCount = mysql_num_rows(result); // pre-allocate enough elements to hold the complete result set @@ -497,5 +497,5 @@ MYSQL_STMT *stmt; // prepared db statement MYSQL_BIND *bind; // field values to insert - psU32 paramCount; // number of placeholders in query + unsigned long paramCount; // number of placeholders in query psU64 j; // row index @@ -528,5 +528,5 @@ // how many place holders are in our query - paramCount = (psU32)mysql_stmt_param_count(stmt); + paramCount = mysql_stmt_param_count(stmt); // structure larger enough to hold one field of data per place holder @@ -591,8 +591,8 @@ MYSQL_RES *result; MYSQL_FIELD *field; - psU32 fieldCount; + unsigned int fieldCount; psMetadata *table; psU32 pType; - psU32 i; + unsigned int i; psPtr column; @@ -642,7 +642,7 @@ char *query; MYSQL_STMT *stmt; // prepared db statement - psU32 paramCount; // number of placeholders in query + unsigned long paramCount; // number of placeholders in query MYSQL_BIND *bind; // field values to insert - psU64 rowsAffected; // number of rows affected by query + my_ulonglong rowsAffected; // number of rows affected by query query = psDBGenerateUpdateRowSQL(tableName, where, values); @@ -670,5 +670,5 @@ // how many place holders are in our query - paramCount = (psU32)mysql_stmt_param_count(stmt); + paramCount = mysql_stmt_param_count(stmt); // structure large enough to hold one field of data per place holder @@ -713,5 +713,5 @@ mysql_commit(dbh->mysql); - rowsAffected = (psU64)mysql_stmt_affected_rows(stmt); + rowsAffected = mysql_stmt_affected_rows(stmt); mysql_stmt_close(stmt); Index: /trunk/psLib/src/dataIO/psDB.c =================================================================== --- /trunk/psLib/src/dataIO/psDB.c (revision 3570) +++ /trunk/psLib/src/dataIO/psDB.c (revision 3571) @@ -12,6 +12,6 @@ * @author Joshua Hoblitt * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-30 23:07:45 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-03-30 23:25:18 $ * * Copyright 2005 Joshua Hoblitt, University of Hawaii @@ -217,6 +217,6 @@ MYSQL_ROW row; // single row of db result set char *query; // SQL query - psU64 rowCount; // number of rows in db result set - psU64 dataSize; // size of field + my_ulonglong rowCount; // number of rows in db result set + unsigned long dataSize; // size of field unsigned int fieldCount; // number of fields in db result set psArray *column = NULL; // return array @@ -250,5 +250,5 @@ } - rowCount = (psU64)mysql_num_rows(result); + rowCount = mysql_num_rows(result); // pre-allocate enough elements to hold the complete result set @@ -261,5 +261,5 @@ // get the first element of lengths array that is part of the // result set - dataSize = (psU64)*mysql_fetch_lengths(result); + dataSize = *(mysql_fetch_lengths(result)); // represent NULL as an empty string @@ -372,7 +372,7 @@ MYSQL_FIELD *field; // field type info char *query; // SQL query - psU64 rowCount; // number of rows in db result set - psU64 fieldCount; // number of fields in db result set - long *fieldLength; // field sizes + my_ulonglong rowCount; // number of rows in db result set + unsigned int fieldCount; // number of fields in db result set + unsigned long *fieldLength; // field sizes long len; // field length psArray *resultSet; // return array @@ -413,5 +413,5 @@ } - rowCount = (psU64)mysql_num_rows(result); + rowCount = mysql_num_rows(result); // pre-allocate enough elements to hold the complete result set @@ -497,5 +497,5 @@ MYSQL_STMT *stmt; // prepared db statement MYSQL_BIND *bind; // field values to insert - psU32 paramCount; // number of placeholders in query + unsigned long paramCount; // number of placeholders in query psU64 j; // row index @@ -528,5 +528,5 @@ // how many place holders are in our query - paramCount = (psU32)mysql_stmt_param_count(stmt); + paramCount = mysql_stmt_param_count(stmt); // structure larger enough to hold one field of data per place holder @@ -591,8 +591,8 @@ MYSQL_RES *result; MYSQL_FIELD *field; - psU32 fieldCount; + unsigned int fieldCount; psMetadata *table; psU32 pType; - psU32 i; + unsigned int i; psPtr column; @@ -642,7 +642,7 @@ char *query; MYSQL_STMT *stmt; // prepared db statement - psU32 paramCount; // number of placeholders in query + unsigned long paramCount; // number of placeholders in query MYSQL_BIND *bind; // field values to insert - psU64 rowsAffected; // number of rows affected by query + my_ulonglong rowsAffected; // number of rows affected by query query = psDBGenerateUpdateRowSQL(tableName, where, values); @@ -670,5 +670,5 @@ // how many place holders are in our query - paramCount = (psU32)mysql_stmt_param_count(stmt); + paramCount = mysql_stmt_param_count(stmt); // structure large enough to hold one field of data per place holder @@ -713,5 +713,5 @@ mysql_commit(dbh->mysql); - rowsAffected = (psU64)mysql_stmt_affected_rows(stmt); + rowsAffected = mysql_stmt_affected_rows(stmt); mysql_stmt_close(stmt); Index: /trunk/psLib/src/db/psDB.c =================================================================== --- /trunk/psLib/src/db/psDB.c (revision 3570) +++ /trunk/psLib/src/db/psDB.c (revision 3571) @@ -12,6 +12,6 @@ * @author Joshua Hoblitt * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-30 23:07:45 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-03-30 23:25:18 $ * * Copyright 2005 Joshua Hoblitt, University of Hawaii @@ -217,6 +217,6 @@ MYSQL_ROW row; // single row of db result set char *query; // SQL query - psU64 rowCount; // number of rows in db result set - psU64 dataSize; // size of field + my_ulonglong rowCount; // number of rows in db result set + unsigned long dataSize; // size of field unsigned int fieldCount; // number of fields in db result set psArray *column = NULL; // return array @@ -250,5 +250,5 @@ } - rowCount = (psU64)mysql_num_rows(result); + rowCount = mysql_num_rows(result); // pre-allocate enough elements to hold the complete result set @@ -261,5 +261,5 @@ // get the first element of lengths array that is part of the // result set - dataSize = (psU64)*mysql_fetch_lengths(result); + dataSize = *(mysql_fetch_lengths(result)); // represent NULL as an empty string @@ -372,7 +372,7 @@ MYSQL_FIELD *field; // field type info char *query; // SQL query - psU64 rowCount; // number of rows in db result set - psU64 fieldCount; // number of fields in db result set - long *fieldLength; // field sizes + my_ulonglong rowCount; // number of rows in db result set + unsigned int fieldCount; // number of fields in db result set + unsigned long *fieldLength; // field sizes long len; // field length psArray *resultSet; // return array @@ -413,5 +413,5 @@ } - rowCount = (psU64)mysql_num_rows(result); + rowCount = mysql_num_rows(result); // pre-allocate enough elements to hold the complete result set @@ -497,5 +497,5 @@ MYSQL_STMT *stmt; // prepared db statement MYSQL_BIND *bind; // field values to insert - psU32 paramCount; // number of placeholders in query + unsigned long paramCount; // number of placeholders in query psU64 j; // row index @@ -528,5 +528,5 @@ // how many place holders are in our query - paramCount = (psU32)mysql_stmt_param_count(stmt); + paramCount = mysql_stmt_param_count(stmt); // structure larger enough to hold one field of data per place holder @@ -591,8 +591,8 @@ MYSQL_RES *result; MYSQL_FIELD *field; - psU32 fieldCount; + unsigned int fieldCount; psMetadata *table; psU32 pType; - psU32 i; + unsigned int i; psPtr column; @@ -642,7 +642,7 @@ char *query; MYSQL_STMT *stmt; // prepared db statement - psU32 paramCount; // number of placeholders in query + unsigned long paramCount; // number of placeholders in query MYSQL_BIND *bind; // field values to insert - psU64 rowsAffected; // number of rows affected by query + my_ulonglong rowsAffected; // number of rows affected by query query = psDBGenerateUpdateRowSQL(tableName, where, values); @@ -670,5 +670,5 @@ // how many place holders are in our query - paramCount = (psU32)mysql_stmt_param_count(stmt); + paramCount = mysql_stmt_param_count(stmt); // structure large enough to hold one field of data per place holder @@ -713,5 +713,5 @@ mysql_commit(dbh->mysql); - rowsAffected = (psU64)mysql_stmt_affected_rows(stmt); + rowsAffected = mysql_stmt_affected_rows(stmt); mysql_stmt_close(stmt); Index: /trunk/psLib/src/fileUtils/psDB.c =================================================================== --- /trunk/psLib/src/fileUtils/psDB.c (revision 3570) +++ /trunk/psLib/src/fileUtils/psDB.c (revision 3571) @@ -12,6 +12,6 @@ * @author Joshua Hoblitt * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-30 23:07:45 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-03-30 23:25:18 $ * * Copyright 2005 Joshua Hoblitt, University of Hawaii @@ -217,6 +217,6 @@ MYSQL_ROW row; // single row of db result set char *query; // SQL query - psU64 rowCount; // number of rows in db result set - psU64 dataSize; // size of field + my_ulonglong rowCount; // number of rows in db result set + unsigned long dataSize; // size of field unsigned int fieldCount; // number of fields in db result set psArray *column = NULL; // return array @@ -250,5 +250,5 @@ } - rowCount = (psU64)mysql_num_rows(result); + rowCount = mysql_num_rows(result); // pre-allocate enough elements to hold the complete result set @@ -261,5 +261,5 @@ // get the first element of lengths array that is part of the // result set - dataSize = (psU64)*mysql_fetch_lengths(result); + dataSize = *(mysql_fetch_lengths(result)); // represent NULL as an empty string @@ -372,7 +372,7 @@ MYSQL_FIELD *field; // field type info char *query; // SQL query - psU64 rowCount; // number of rows in db result set - psU64 fieldCount; // number of fields in db result set - long *fieldLength; // field sizes + my_ulonglong rowCount; // number of rows in db result set + unsigned int fieldCount; // number of fields in db result set + unsigned long *fieldLength; // field sizes long len; // field length psArray *resultSet; // return array @@ -413,5 +413,5 @@ } - rowCount = (psU64)mysql_num_rows(result); + rowCount = mysql_num_rows(result); // pre-allocate enough elements to hold the complete result set @@ -497,5 +497,5 @@ MYSQL_STMT *stmt; // prepared db statement MYSQL_BIND *bind; // field values to insert - psU32 paramCount; // number of placeholders in query + unsigned long paramCount; // number of placeholders in query psU64 j; // row index @@ -528,5 +528,5 @@ // how many place holders are in our query - paramCount = (psU32)mysql_stmt_param_count(stmt); + paramCount = mysql_stmt_param_count(stmt); // structure larger enough to hold one field of data per place holder @@ -591,8 +591,8 @@ MYSQL_RES *result; MYSQL_FIELD *field; - psU32 fieldCount; + unsigned int fieldCount; psMetadata *table; psU32 pType; - psU32 i; + unsigned int i; psPtr column; @@ -642,7 +642,7 @@ char *query; MYSQL_STMT *stmt; // prepared db statement - psU32 paramCount; // number of placeholders in query + unsigned long paramCount; // number of placeholders in query MYSQL_BIND *bind; // field values to insert - psU64 rowsAffected; // number of rows affected by query + my_ulonglong rowsAffected; // number of rows affected by query query = psDBGenerateUpdateRowSQL(tableName, where, values); @@ -670,5 +670,5 @@ // how many place holders are in our query - paramCount = (psU32)mysql_stmt_param_count(stmt); + paramCount = mysql_stmt_param_count(stmt); // structure large enough to hold one field of data per place holder @@ -713,5 +713,5 @@ mysql_commit(dbh->mysql); - rowsAffected = (psU64)mysql_stmt_affected_rows(stmt); + rowsAffected = mysql_stmt_affected_rows(stmt); mysql_stmt_close(stmt);