Changeset 34772 for branches/czw_branch/20120906/Ohana/src/dvomerge/src/dvomergeHistory.c

Timestamp:

Dec 6, 2012, 6:32:19 PM (14 years ago)

Author:

watersc1

Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

Location:

branches/czw_branch/20120906/Ohana

Files:

• . (modified) (1 prop)
• src/dvomerge/src/dvomergeHistory.c (modified) (1 diff)

branches/czw_branch/20120906/Ohana/src/dvomerge/src/dvomergeHistory.c

@@ -132 +132 @@
   int stat_result = stat (filename, &outstats);
   if (stat_result) {
-    if (errno == ENOENT) return NULL;
+    if (errno == ENOENT) {
+      dmhObject *history = NULL;
+      ALLOCATE (history, dmhObject, 1);
+      history->Nmerge = 0;
+    
+      // ALLOCATE full list
+      ALLOCATE (history->size, off_t,  history->Nmerge);
+      ALLOCATE (history->time, time_t, history->Nmerge);
+      ALLOCATE (history->date, char *, history->Nmerge);
+      return history;
+    }
     fprintf (stderr, "cannot read stats on output file %s\n", filename);
     perror ("stats error message:");