Index: trunk/psLib/src/db/psDB.c =================================================================== --- trunk/psLib/src/db/psDB.c (revision 7652) +++ trunk/psLib/src/db/psDB.c (revision 7654) @@ -12,6 +12,6 @@ * @author Joshua Hoblitt * - * @version $Revision: 1.63 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-06-23 03:49:16 $ + * @version $Revision: 1.64 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-06-23 21:11:17 $ * * Copyright 2005 Joshua Hoblitt, University of Hawaii @@ -767,24 +767,21 @@ ...) { + PS_ASSERT_PTR_NON_NULL(dbh, false); + PS_ASSERT_PTR_NON_NULL(format, false); + + char *query = NULL; + + // Run query va_list argPtr; - char *dest = NULL; - - // Verify database object is not NULL - if(dbh == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL,true,PS_ERRORTEXT_psDB_INVALID_PSDB); - return false; - } - - // Run query va_start(argPtr, format); if(argPtr == NULL) { - dest=psStringCopy(format); + query = psStringCopy(format); } else { - int destSize = vsnprintf(dest, 0, format, argPtr); - dest = psAlloc(destSize+1); - vsnprintf(dest, destSize+1, format, argPtr); + int destSize = vsnprintf(query, 0, format, argPtr); + query = psAlloc(destSize+1); + vsnprintf(query, destSize+1, format, argPtr); } va_end(argPtr); - if (mysql_real_query(dbh->mysql, dest, (unsigned long)strlen(dest)) !=0) { + if (mysql_real_query(dbh->mysql, query, (unsigned long)strlen(query)) !=0) { //The following if statement was added to standardize outputs between platforms for testing purposes. char mysqlTemp[165]; @@ -796,9 +793,10 @@ psError(PS_ERR_UNKNOWN, true, PS_ERRORTEXT_psDB_SQL_QUERY_FAIL, mysql_error(dbh->mysql)); } - psFree(dest); + psFree(query); return false; } - psFree(dest); + psFree(query); + return true; } @@ -809,12 +807,12 @@ ...) { - va_list argPtr; - char *query = NULL; - PS_ASSERT_PTR_NON_NULL(dbh, -1); PS_ASSERT_PTR_NON_NULL(rowSet, -1); PS_ASSERT_PTR_NON_NULL(format, -1); + char *query = NULL; + // generate query string + va_list argPtr; va_start(argPtr, format); if(argPtr == NULL) { @@ -891,4 +889,6 @@ psArray *p_psDBFetchResult(psDB *dbh) { + PS_ASSERT_PTR_NON_NULL(dbh, NULL); + MYSQL_RES *result; // complete db result set MYSQL_ROW row; // single row of db result set @@ -989,9 +989,9 @@ const psMetadata *values) { - mysqlType *mType; // type tmp variable - static bool isNull = true; // used in a MYSQL_BIND to indicate NULL, - PS_ASSERT_PTR_NON_NULL(mysqlRow, false); PS_ASSERT_PTR_NON_NULL(values, false); + + mysqlType *mType; // type tmp variable + static bool isNull = true; // used in a MYSQL_BIND to indicate NULL MYSQL_BIND *bind = mysqlRow->bind; @@ -1118,4 +1118,6 @@ static void psDBMysqlRowFree(psDBMysqlRow *mysqlRow) { + PS_ASSERT_PTR_NON_NULL(mysqlRow, ); + MYSQL_BIND *bind = mysqlRow->bind; @@ -1138,14 +1140,11 @@ const psMetadata *table) { + PS_ASSERT_PTR_NON_NULL(tableName, NULL); + PS_ASSERT_PTR_NON_NULL(table, NULL); + char *query = NULL; // complete query psMetadataItem *item; // column description psListIterator *cursor; // column iterator char *colType; // type lookup table - - // Verify input parameters are not null - if ( (tableName==NULL) || (table==NULL) ) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psDB_TABLE_PARAM_NULL); - return NULL; - } // Begin to create SQL string to create table @@ -1237,4 +1236,7 @@ psU64 limit) { + PS_ASSERT_PTR_NON_NULL(tableName, NULL); + PS_ASSERT_PTR_NON_NULL(col, NULL); + char *query = NULL; char *whereSQL; @@ -1275,20 +1277,11 @@ const psMetadata *row) { + PS_ASSERT_PTR_NON_NULL(tableName, NULL); + PS_ASSERT_PTR_NON_NULL(row, NULL); + char *query = NULL; psListIterator *cursor; psMetadataItem *item; - // Check if table is NULL - if(tableName == NULL) { - psError(PS_ERR_UNEXPECTED_NULL,true,PS_ERRORTEXT_psDB_QUERY_GEN_FAIL); - return NULL; - } - - // Check if row is NULL - if(row == NULL) { - psError(PS_ERR_UNEXPECTED_NULL,true,PS_ERRORTEXT_psDB_QUERY_GEN_FAIL); - return NULL; - } - // Start building query string psStringAppend(&query, "INSERT INTO %s (", tableName); @@ -1333,13 +1326,10 @@ const psMetadata *values) { + PS_ASSERT_PTR_NON_NULL(tableName, NULL); + PS_ASSERT_PTR_NON_NULL(values, NULL); + char *query = NULL; char *setSQL; char *whereSQL; - - // Verify where and values pointer are not NULL - if ((!values) || (!where)) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psDB_UPDATE_ROW_FAIL); - return NULL; - } // Create set SQL substring @@ -1369,4 +1359,6 @@ unsigned long long limit) { + PS_ASSERT_PTR_NON_NULL(tableName, NULL); + char *query = NULL; char *whereSQL; @@ -1402,12 +1394,7 @@ static char *psDBGenerateWhereSQL(const psMetadata *where) { - char *query = NULL; - - if (!where) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, "where param may not be NULL."); - return NULL; - } - - query = psStringCopy("WHERE "); + PS_ASSERT_PTR_NON_NULL(where, NULL); + + char *query = psStringCopy("WHERE "); // we need to know if an item is 'MULTI' so we have to march through the @@ -1494,21 +1481,14 @@ ) { - char *query = NULL; - psListIterator *cursor; - psMetadataItem *item; - - if (!set - ) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, "set param may not be NULL."); - - return NULL; - } - - query = psStringCopy("SET "); - - cursor = psListIteratorAlloc(set - ->list, 0, false); + PS_ASSERT_PTR_NON_NULL(set + , NULL); + + char *query = psStringCopy("SET "); + + psListIterator *cursor = psListIteratorAlloc(set + ->list, 0, false); // find column name + psMetadataItem *item = NULL; while ((item = psListGetAndIncrement(cursor))) { // + column name + _ + = + _ + ? @@ -1528,7 +1508,7 @@ static char *psDBGenerateConditionalSQL(const psMetadataItem *item) { - char *query = NULL; - PS_ASSERT_PTR_NON_NULL(item, NULL); + + char *query = NULL; // stringify the psMetadataItem into a SQL search specification @@ -1862,7 +1842,5 @@ bool isUnsigned) { - mysqlType *mType; - - mType = psAlloc(sizeof(mysqlType)); + mysqlType *mType = psAlloc(sizeof(mysqlType)); mType->type = type; mType->isUnsigned = isUnsigned; @@ -1875,9 +1853,8 @@ const char *string) { - char *key; - char *value; - - key = psDBIntToString((psU64)type); - value = psStringCopy(string); + PS_ASSERT_PTR_NON_NULL(lookupTable, ); + + char *key = psDBIntToString((psU64)type); + char *value = psStringCopy(string); psHashAdd(lookupTable, key, value); @@ -1891,7 +1868,7 @@ psPtr value) { - char *key; - - key = psDBIntToString((psU64)type); + PS_ASSERT_PTR_NON_NULL(lookupTable, ); + + char *key = psDBIntToString((psU64)type); psHashAdd(lookupTable, key, value); @@ -2023,12 +2000,9 @@ static char *psDBIntToString(psU64 n) { - char *string; - size_t length; - // length of string + \0 // if n is 0, length is 1 char + \0 - length = n ? (size_t)log10((double)n) + 1 - : 2; - string = psAlloc(length); + size_t length = n ? (size_t)log10((double)n) + 1 + : 2; + char *string = psAlloc(length); sprintf(string, "%li", (long int)n);