Changeset 20304

Timestamp:

Oct 21, 2008, 3:53:09 PM (18 years ago)

Author:

Paul Price

Message:

Support more types, and generate an error when the type isn't recognised.

File:

• trunk/ppStats/src/ppStatsFromMetadataPrint.c (modified) (2 diffs)

trunk/ppStats/src/ppStatsFromMetadataPrint.c

@@ -2 +2 @@
 
 // calculate the stats for the non-constant entries (already calculated)
-bool ppStatsFromMetadataPrint (psArray *entries, char *filename) {
-
+bool ppStatsFromMetadataPrint(psArray *entries, char *filename)
+{
+    bool status = true;                 // Status of printing
     FILE *f = NULL;
     if (!strcmp (filename, "-")) {
@@ -21 +22 @@
         if (!entry->value) continue;
 
-        if (entry->value->type == PS_DATA_STRING) {
-            fprintf (f, "%s '%s' ", entry->flag, entry->value->data.str);
-        }
+// Print a value
+#define VALUE_NUMERICAL_CASE(TYPE, FORMAT, NAME) \
+      case PS_TYPE_##TYPE: \
+        fprintf(f, "%s %" FORMAT, entry->flag, entry->value->data.NAME); \
+        break; \
 
-        if (entry->value->type == PS_DATA_BOOL && entry->value->data.B) {
-            fprintf (f, "%s ", entry->flag);
-        }
 
-        if (entry->value->type == PS_DATA_F32) {
-            fprintf (f, "%s %f ", entry->flag, entry->value->data.F32);
-        }
-        if (entry->value->type == PS_DATA_TIME) {
-            psTime *t = (psTime *)  entry->value->data.V;
-            psString str = psTimeToISO(t);
-            fprintf (f, "%s %.19sZ ", entry->flag, str);
-            psFree(str);
+        switch (entry->value->type) {
+            VALUE_NUMERICAL_CASE(U8,  PRIu8,  U8);
+            VALUE_NUMERICAL_CASE(U16, PRIu16, U16);
+            VALUE_NUMERICAL_CASE(U32, PRIu32, U32);
+            VALUE_NUMERICAL_CASE(U64, PRIu64, U64);
+            VALUE_NUMERICAL_CASE(S8,  PRId8,  S8);
+            VALUE_NUMERICAL_CASE(S16, PRId16, S16);
+            VALUE_NUMERICAL_CASE(S32, PRId32, S32);
+            VALUE_NUMERICAL_CASE(S64, PRId64, S64);
+            VALUE_NUMERICAL_CASE(F32, "f",    F32);
+            VALUE_NUMERICAL_CASE(F64, "lf",   F64);
+          case PS_DATA_STRING:
+            fprintf(f, "%s '%s' ", entry->flag, entry->value->data.str);
+            break;
+          case PS_DATA_BOOL:
+            if (entry->value->data.B) {
+                fprintf(f, "%s ", entry->flag);
+            }
+            break;
+          case PS_DATA_TIME: {
+              psTime *t = (psTime*)entry->value->data.V;
+              psString str = psTimeToISO(t);
+              fprintf(f, "%s %.19sZ ", entry->flag, str);
+              psFree(str);
+              break;
+          }
+          default:
+            psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Unsupported type: %x", entry->value->type);
+            status = false;
         }
     }
-    fprintf (f, "\n");
+    fprintf(f, "\n");
 
     if (f != stdout) fclose (f);
-    return true;
+    return status;
 }