Changeset 20303 for trunk/ppStats/src/ppStatsFromMetadataPrint.c

Timestamp:

Oct 21, 2008, 3:33:07 PM (18 years ago)

Author:

Paul Price

Message:

Boolean should just print a flag, not a flag with a value.

File:

• trunk/ppStats/src/ppStatsFromMetadataPrint.c (modified) (1 diff)

trunk/ppStats/src/ppStatsFromMetadataPrint.c

@@ -6 +6 @@
     FILE *f = NULL;
     if (!strcmp (filename, "-")) {
-        f = stdout;
+        f = stdout;
     } else {
-        f = fopen (filename, "w");
-        if (f == NULL) {
-            psError(PS_ERR_UNKNOWN, false, "ppStatsFromMetadata cannot open output file %s\n", filename);
-            return false;
-        }
+        f = fopen (filename, "w");
+        if (f == NULL) {
+            psError(PS_ERR_UNKNOWN, false, "ppStatsFromMetadata cannot open output file %s\n", filename);
+            return false;
+        }
     }
 
     // at this point, we have entries with values (of type STR or F32) or NULL
     for (int i = 0; i < entries->n; i++) {
-        ppStatsEntry *entry = entries->data[i];
+        ppStatsEntry *entry = entries->data[i];
 
-        if (!entry->value) continue;
+        if (!entry->value) continue;
 
-        if (entry->value->type == PS_DATA_STRING) {
-            fprintf (f, "%s '%s' ", entry->flag, entry->value->data.str);
-        }
-        
-        if (entry->value->type == PS_DATA_BOOL) {
-            fprintf (f, "%s %s ", entry->flag, entry->value->data.B ? "T" : "F");
-        }
+        if (entry->value->type == PS_DATA_STRING) {
+            fprintf (f, "%s '%s' ", entry->flag, entry->value->data.str);
+        }
 
-        if (entry->value->type == PS_DATA_F32) {
-            fprintf (f, "%s %f ", entry->flag, entry->value->data.F32);
-        }
+        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);
+            fprintf (f, "%s %.19sZ ", entry->flag, str);
             psFree(str);
         }