Changeset 8627 for trunk/psLib/src/db/psDB.c

Timestamp:

Aug 25, 2006, 6:34:28 PM (20 years ago)

Author:

jhoblitt

Message:

add gcc format attributes to:

psAbort()
psErrorStackPrint()
p_psError()
p_psWarning()
psLogMsg()
p_psTrace()

add PS_ASSERT_LONG_LARGER_THAN_OR_EQUAL
add PS_ASSERT_S64_WITHIN_RANGE
fix PS_ASSERT_LONG_WITHIN_RANGE
fix a wide range of format related issues:

• missing format field specifiers
• missing format args
• incorrect format field specifiers
• constants declared with the wrong type (float vs. int)
• PS_ASSERT* for the wrong type
• attemps to print structs with *printf()
• unportable format specifiers, eg. long vs. long long

File:

• trunk/psLib/src/db/psDB.c (modified) (7 diffs)

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.87 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-26 00:32:39 $
+ *  @version $Revision: 1.88 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-26 04:34:28 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -157 +157 @@
     if (!psDBExplicitTrans(dbh, false)) {
         psError(PS_ERR_UNKNOWN, true,
-                "failed to set transaction type", mysql_error(mysql));
+                "failed to set transaction type. Error: %s", mysql_error(mysql));
 
         mysql_close(mysql);
@@ -1103 +1103 @@
             // convert NaNs to NULL and set the buffer_length for strings
 
-            if ((char *)item->data.V) {
+            if (item->data.str) {
                 // will handle the case of "" as a NULL database value
-                bind[i].buffer_length = (unsigned long)strlen((char *)item->data.V);
+                bind[i].buffer_length = (unsigned long)strlen(item->data.str);
                 bind[i].length  = &bind[i].buffer_length;
                 bind[i].buffer  = psStringCopy(item->data.V);
-                bind[i].is_null = *(char *)item->data.V == '\0'
+                bind[i].is_null = *item->data.str == '\0'
                                   ? (my_bool *)&isNull
                                   : NULL;
@@ -1124 +1124 @@
             // make a copy of the psTime so we don't modify user data when we
             // try to do the conversion
-            if ((char *)item->data.V) {
+            if (item->data.str) {
                 psTime *time = (psTime *)item->data.V;
                 struct tm *tmTime = psTimeToTM(time);
@@ -1252 +1252 @@
         } else if (item->type == PS_DATA_STRING) {
             // + column name + _ + varchar( + length + )
-            psStringAppend(&query, "%s VARCHAR(%s)", item->name, (char *)item->data.V);
+            psStringAppend(&query, "%s VARCHAR(%s)", item->name, item->data.str);
         } else {
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,
@@ -1634 +1634 @@
         // + column name + _ + like + _ + ' + value + '
         // check for NULL and empty ("") strings
-        if (item->data.V == NULL || *(char *)item->data.V == '\0') {
+        if (item->data.V == NULL || *item->data.str == '\0') {
             psStringAppend(&query, "%s IS NULL", item->name);
         } else {
@@ -1642 +1642 @@
                 // very large TEXT columns that really shouldn't be
                 // used in a where clause...
-                psStringAppend(&query, "%s LIKE '%s'", item->name, (char *)item->data.V);
+                psStringAppend(&query, "%s LIKE '%s'", item->name, item->data.str);
             } else {
-                psStringAppend(&query, "%s = '%s'", item->name, (char *)item->data.V);
+                psStringAppend(&query, "%s = '%s'", item->name, item->data.str);
             }
         }