Changeset 9748

Timestamp:

Oct 25, 2006, 4:57:33 PM (20 years ago)

Author:

jhoblitt

Message:

convert large if/else in psDBGenerateConditionalSQL() into a switch stmt

File:

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

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.107 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-24 22:52:55 $
+ *  @version $Revision: 1.108 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-26 02:57:33 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -1638 +1638 @@
     }
 
-    if ((item->type == PS_DATA_S32) || (item->type == PS_TYPE_S32)) {
+    switch (item->type) {
+    case PS_DATA_S32:
         psStringAppend(&query, "%s=%d", itemName, (int)(item->data.S32));
-    } else if ((item->type == PS_DATA_F32) || (item->type == PS_TYPE_F32)) {
+        break;
+    case PS_DATA_F32:
         psStringAppend(&query, "(ABS(%s - %.8f) < %.8f)", itemName, (float)(item->data.F32), FLT_EPSILON * 10);
-    } else if ((item->type == PS_DATA_F64) || (item->type == PS_TYPE_F64)) {
+        break;
+    case PS_DATA_F64:
         psStringAppend(&query, "(ABS(%s - %.17f) < %.17f)", itemName, (double)(item->data.F64), DBL_EPSILON * 10);
-    } else if ((item->type == PS_DATA_BOOL) || (item->type == PS_TYPE_BOOL)) {
+        break;
+    case PS_DATA_BOOL:
         psStringAppend(&query, "%s=%d", itemName, (int)(item->data.B));
-    } else if (item->type == PS_DATA_STRING) {
+        break;
+    case PS_DATA_STRING:
         // + column name + _ + like + _ + ' + value + '
         // check for NULL and empty ("") strings
@@ -1662 +1667 @@
             }
         }
-    } else {
+        break;
+    default:
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
                 "Only types PS_DATA_S32, PS_DATA_F32, PS_DATA_F64, PS_DATA_BOOL, PS_DATA_STRING are supported");