Changeset 36084 for trunk/Ohana/src/dvomerge

Timestamp:

Aug 31, 2013, 5:31:39 AM (13 years ago)

Author:

eugene

Message:

merge changes from EAM branch (medianfilter list error; handle empty kapa message; add join and vlist cmds, match2d help, excel-style lists: foo:A equiv to foo:0, time-based dvo temp-file purging, fix avmatch parallel coordlist bug, sub-pixel resolve sersic model, dgaussjordan needs larger dynamic range, avextract psfqf, psfqfperf, stargal)

Location:

trunk/Ohana

Files:

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

trunk/Ohana/src/dvomerge/src/dvoverify_catalogs.c

@@ -143 +143 @@
       continue;
     }
-    fscanf (results, "%*s %d %*s %d", &NbadHost, &NNotSortedHost);
+    int Nresults = fscanf (results, "%*s %d %*s %d", &NbadHost, &NNotSortedHost);
+    if (Nresults != 2) {
+      fprintf (stderr, "warning: failure scanning results\n");
+      fclose (results);
+      continue;
+    }
     *Nbad += NbadHost;
     NNotSorted += NNotSortedHost;