Changeset 9755 for trunk/psLib

Timestamp:

Oct 26, 2006, 3:10:25 PM (20 years ago)

Author:

jhoblitt

Message:

fix formatMetadataItem() to handle printing of NULL psTimes

File:

• trunk/psLib/src/types/psMetadataConfig.c (modified) (2 diffs)

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.98 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-10-26 04:44:09 $
+*  @version $Revision: 1.99 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-27 01:10:25 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1422 +1422 @@
         psStringAppend(&content, "%-15s  ", item->name);
         psTime *time = item->data.V;
-        if ( time->type == PS_TIME_UTC )
-            psStringAppend(&content, "%-8s  ", "UTC");
-        else if ( time->type == PS_TIME_TAI )
-            psStringAppend(&content, "%-8s  ", "TAI");
-        else if ( time->type == PS_TIME_UT1 )
-            psStringAppend(&content, "%-8s  ", "UT1");
-        else if ( time->type == PS_TIME_TT )
-            psStringAppend(&content, "%-8s  ", "TT");
-        else {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified psDataType, %d, is not supported."), time->type);
-            psFree(content);
-            return NULL;
-        }
-
-        psString timeStr = psTimeToISO(time);
-        psStringAppend(&content, "%-15s", timeStr);
-        psFree(timeStr);
+        if (time) {
+            switch (time->type) {
+            case PS_TIME_UTC:
+                psStringAppend(&content, "%-8s  ", "UTC");
+                break;
+            case PS_TIME_TAI:
+                psStringAppend(&content, "%-8s  ", "TAI");
+                break;
+            case PS_TIME_UT1:
+                psStringAppend(&content, "%-8s  ", "UT1");
+                break;
+            case PS_TIME_TT:
+                psStringAppend(&content, "%-8s  ", "TT");
+                break;
+            default:
+                psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                        _("Specified psTime type, %d, is not supported."),
+                        time->type);
+                psFree(content);
+                return NULL;
+            }
+            psString timeStr = psTimeToISO(time);
+            psStringAppend(&content, "%-15s", timeStr);
+            psFree(timeStr);
+        } else {
+            // psTime is a NULL pointer
+            psStringAppend(&content, "%-15s", "NULL");
+        }
 
         if (item->comment && strncmp(item->comment,"",2)) {