Index: trunk/Ohana/src/libdvo/src/dvo_catalog_split.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_catalog_split.c	(revision 39319)
+++ trunk/Ohana/src/libdvo/src/dvo_catalog_split.c	(revision 39320)
@@ -101,5 +101,5 @@
   }
 
-  if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
   // write PHU header
@@ -129,5 +129,5 @@
 # endif
 
-  if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
   FTable *outtable = ftable;
@@ -310,4 +310,6 @@
 int gfits_fread_uncompressed (Catalog *catalog, FTable *ftable, char *nativeOrder, char VERBOSE) {
 
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
+
   // fread_ftable_data requires the header
 
@@ -317,4 +319,5 @@
     return FALSE;
   }
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
   // NOTE: fread_ftable returns an unswapped table; uncompress swaps the bytes into native order
     
@@ -331,4 +334,6 @@
       return FALSE;
     }
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
+
     if (!gfits_uncompress_table (ftable, &rawtable)) {
       if (VERBOSE) fprintf (stderr, "failed to uncompress table\n");
@@ -336,4 +341,5 @@
       return FALSE;
     }
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     char compressMode[256];
@@ -346,4 +352,5 @@
     gfits_free_header (ftable->header);
     gfits_free_table (ftable); 
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
     
     // copies values but does not allocate new memory
@@ -866,5 +873,5 @@
   }
 
-  if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
   Nmeasure_disk_new = MAX (catalog[0].Nmeasure_disk, catalog[0].Nmeasure + catalog[0].Nmeasure_off);
@@ -891,5 +898,5 @@
   /* in split mode, we can save only part of the data */ 
 
-  if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
   /*** Average Table ***/
@@ -918,5 +925,5 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     if (!dvo_catalog_save_subcat (catalog, &ftable, start, Nrows, catalog[0].Naverage_disk, Naverage_disk_new)) {
@@ -925,5 +932,5 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     gfits_free_header (&header);
@@ -954,5 +961,5 @@
     assert (catalog[0].Nmeasure_disk >= catalog[0].Nmeasure_off);
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // if we are going to compress, we need to receive unswapped data -- 
@@ -965,5 +972,5 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // write out Measure table
@@ -973,5 +980,5 @@
       goto failure;
     }
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     gfits_free_header (&header);
@@ -1023,5 +1030,5 @@
     int swapFromNative = !output_is_compressed (start, Nrows, Nsecfilt_disk_new, catalog->catcompress);
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // convert to external table format
@@ -1031,5 +1038,5 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // write out SecFilt table
@@ -1562,5 +1569,5 @@
   }
 
-  if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
   Nmeasure_disk_new = catalog[0].Nmeasure;
@@ -1587,5 +1594,5 @@
   /* in split mode, we can save only part of the data, but not using this function (use e.g., dvo_catalog_update_split) */ 
 
-  if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
   /*** Average Table ***/
@@ -1614,5 +1621,5 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     if (!dvo_catalog_save_subcat (catalog, &ftable, start, Nrows, catalog[0].Naverage_disk, Naverage_disk_new)) {
@@ -1621,5 +1628,5 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     gfits_free_header (&header);
@@ -1650,5 +1657,5 @@
     assert (catalog[0].Nmeasure_disk >= catalog[0].Nmeasure_off);
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // if we are going to compress, we need to receive unswapped data -- 
@@ -1662,5 +1669,5 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // write out Measure table
@@ -1670,5 +1677,5 @@
       goto failure;
     }
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     gfits_free_header (&header);
@@ -1723,5 +1730,5 @@
     int swapFromNative = !output_is_compressed (start, Nrows, Nsecfilt_disk_new, catalog->catcompress);
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // convert to external table format
@@ -1731,5 +1738,5 @@
     }
 
-    if (OHANA_MEMCHECK) ohana_memcheck_func (TRUE);
+    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
     // write out SecFilt table