Index: trunk/ppStats/src/ppStatsFromMetadataStats.c
===================================================================
--- trunk/ppStats/src/ppStatsFromMetadataStats.c	(revision 19955)
+++ trunk/ppStats/src/ppStatsFromMetadataStats.c	(revision 19965)
@@ -2,62 +2,49 @@
 
 // calculate the stats for the non-constant entries (already calculated)
-bool ppStatsFromMetadataStats (psArray *entries) {
-
-    double value;
-    psStats *stats = NULL;
+bool ppStatsFromMetadataStats(psArray *entries) {
 
     for (int i = 0; i < entries->n; i++) {
-	ppStatsEntry *entry = entries->data[i];
+        ppStatsEntry *entry = entries->data[i];
 
-	if (!strcasecmp (entry->statistic, "constant")) continue;
-	
-	// XXX skip or warn on missing stats?
-	if (!entry->vector) continue;
+        if (!strcasecmp(entry->statistic, "constant")) {
+            continue;
+        }
 
-	psStatsOptions option;
-	if (!strcasecmp (entry->statistic, "RMS")) {
-	    option = psStatsOptionFromString ("ROBUST_MEDIAN");
-	    goto got_stats;
-	} 
-	if (!strcasecmp (entry->statistic, "SUM")) {
-	    option = psStatsOptionFromString ("SAMPLE_MEAN");
-	    goto got_stats;
-	} 
-	if (!strcasecmp (entry->statistic, "UQ")) {
-	    option = psStatsOptionFromString ("ROBUST_QUARTILE");
-	    goto got_stats;
-	} 
-	if (!strcasecmp (entry->statistic, "LQ")) {
-	    option = psStatsOptionFromString ("ROBUST_QUARTILE");
-	    goto got_stats;
-	} 
+        // XXX skip or warn on missing stats?
+        if (!entry->vector) {
+            continue;
+        }
 
-	option = psStatsOptionFromString (entry->statistic);
-	
-    got_stats:
-	stats = psStatsAlloc (option);
+        psStatsOptions option;
+        if (!strcasecmp (entry->statistic, "RMS")) {
+            option = psStatsOptionFromString ("ROBUST_MEDIAN");
+        } else if (!strcasecmp (entry->statistic, "SUM")) {
+            option = psStatsOptionFromString ("SAMPLE_MEAN");
+        } else if (!strcasecmp (entry->statistic, "UQ")) {
+            option = psStatsOptionFromString ("ROBUST_QUARTILE");
+        } else if (!strcasecmp (entry->statistic, "LQ")) {
+            option = psStatsOptionFromString ("ROBUST_QUARTILE");
+        } else {
+            option = psStatsOptionFromString (entry->statistic);
+        }
 
-	psVectorStats (stats, entry->vector, NULL, NULL, 0);
+        psStats *stats = psStatsAlloc(option);
 
-	if (!strcasecmp (entry->statistic, "RMS")) {
-	    value = sqrt(value);
-	    goto got_value;
-	} 
-	if (!strcasecmp (entry->statistic, "SUM")) {
-	    value = stats->sampleMean * entry->vector->n;
-	    goto got_value;
-	} 
-	if (!strcasecmp (entry->statistic, "UQ")) {
-	    value = stats->robustUQ;
-	    goto got_value;
-	} 
-	if (!strcasecmp (entry->statistic, "LQ")) {
-	    value = stats->robustLQ;
-	    goto got_value;
-	} 
-	value = psStatsGetValue (stats, option);
+        psVectorStats(stats, entry->vector, NULL, NULL, 0);
 
-    got_value:
-	entry->value = psMetadataItemAllocF32 (entry->keyword, entry->statistic, value);
+        double value;
+        if (!strcasecmp (entry->statistic, "RMS")) {
+            value = sqrt(value);
+        } else if (!strcasecmp (entry->statistic, "SUM")) {
+            value = stats->sampleMean * entry->vector->n;
+        } else if (!strcasecmp (entry->statistic, "UQ")) {
+            value = stats->robustUQ;
+        } else if (!strcasecmp (entry->statistic, "LQ")) {
+            value = stats->robustLQ;
+        } else {
+            value = psStatsGetValue (stats, option);
+        }
+        entry->value = psMetadataItemAllocF32(entry->keyword, entry->statistic, value);
+        psFree(stats);
     }
     return true;