Merge from 1.10

Comments, whitespace
Simple init and if block brackets.
Minimal code changes limited to return value and spelling

1 files changed, 1 insertions, 38 deletions

diff --git a/src/H5HFhuge.c b/src/H5HFhuge.c
index 83634e8..5457612 100644
--- a/src/H5HFhuge.c
+++ b/src/H5HFhuge.c
@@ -15,7 +15,7 @@
  *
  * Created:		H5HFhuge.c
  *			Aug  7 2006
- *			Quincey Koziol <koziol@hdfgroup.org>
+ *			Quincey Koziol
  *
  * Purpose:		Routines for "huge" objects in fractal heap
  *
@@ -86,7 +86,6 @@ static herr_t  H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *
  * Return:	SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Aug  7 2006
  *
  *-------------------------------------------------------------------------
@@ -166,7 +165,6 @@ done:
  * Return:	SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Aug  7 2006
  *
  *-------------------------------------------------------------------------
@@ -187,10 +185,6 @@ H5HF_huge_init(H5HF_hdr_t *hdr)
      *  the file in the heap ID (which will speed up accessing it) and we don't
      *  have any I/O pipeline filters.
      */
-#ifdef QAK
-    HDfprintf(stderr, "%s: hdr->id_len = %u\n", "H5HF_huge_init", (unsigned)hdr->id_len);
-    HDfprintf(stderr, "%s: hdr->filter_len = %u\n", "H5HF_huge_init", (unsigned)hdr->filter_len);
-#endif /* QAK */
     if (hdr->filter_len > 0) {
         if ((hdr->id_len - 1) >= (unsigned)(hdr->sizeof_addr + hdr->sizeof_size + 4 + hdr->sizeof_size)) {
             /* Indicate that v2 B-tree doesn't have to be used to locate object */
@@ -240,7 +234,6 @@ H5HF_huge_init(H5HF_hdr_t *hdr)
  * Return:	SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Aug 15 2006
  *
  *-------------------------------------------------------------------------
@@ -287,7 +280,6 @@ done:
  * Return:	SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Aug  7 2006
  *
  *-------------------------------------------------------------------------
@@ -349,11 +341,6 @@ H5HF_huge_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, void *obj, voi
         if (H5Z_pipeline(&(hdr->pline), 0, &filter_mask, H5Z_NO_EDC, filter_cb, &nbytes, &write_size,
                          &write_buf) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTFILTER, FAIL, "output pipeline failed")
-#ifdef QAK
-        HDfprintf(stderr, "%s: nbytes = %Zu, write_size = %Zu, write_buf = %p\n", FUNC, nbytes, write_size,
-                  write_buf);
-        HDfprintf(stderr, "%s: obj_size = %Zu, obj = %p\n", FUNC, obj_size, obj);
-#endif /* QAK */
 
         /* Update size of object on disk */
         write_size = nbytes;
@@ -387,10 +374,6 @@ H5HF_huge_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, void *obj, voi
             obj_rec.len         = write_size;
             obj_rec.filter_mask = filter_mask;
             obj_rec.obj_size    = obj_size;
-#ifdef QAK
-            HDfprintf(stderr, "%s: obj_rec = {%a, %Hu, %x, %Hu}\n", FUNC, obj_rec.addr, obj_rec.len,
-                      obj_rec.filter_mask, obj_rec.obj_size);
-#endif /* QAK */
 
             /* Insert record for object in v2 B-tree */
             if (H5B2_insert(hdr->huge_bt2, dxpl_id, &obj_rec) < 0)
@@ -410,9 +393,6 @@ H5HF_huge_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, void *obj, voi
             /* Initialize record for tracking object in v2 B-tree */
             obj_rec.addr = obj_addr;
             obj_rec.len  = write_size;
-#ifdef QAK
-            HDfprintf(stderr, "%s: obj_rec = {%a, %Hu}\n", FUNC, obj_rec.addr, obj_rec.len);
-#endif /* QAK */
 
             /* Insert record for object in v2 B-tree */
             if (H5B2_insert(hdr->huge_bt2, dxpl_id, &obj_rec) < 0)
@@ -442,11 +422,6 @@ H5HF_huge_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, void *obj, voi
             filt_indir_rec.filter_mask = filter_mask;
             filt_indir_rec.obj_size    = obj_size;
             filt_indir_rec.id          = new_id;
-#ifdef QAK
-            HDfprintf(stderr, "%s: filt_indir_rec = {%a, %Hu, %x, %Hu, %Hu}\n", FUNC, filt_indir_rec.addr,
-                      filt_indir_rec.len, filt_indir_rec.filter_mask, filt_indir_rec.obj_size,
-                      filt_indir_rec.id);
-#endif /* QAK */
 
             /* Set pointer to record to insert */
             ins_rec = &filt_indir_rec;
@@ -456,10 +431,6 @@ H5HF_huge_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, void *obj, voi
             indir_rec.addr = obj_addr;
             indir_rec.len  = write_size;
             indir_rec.id   = new_id;
-#ifdef QAK
-            HDfprintf(stderr, "%s: indir_rec = {%a, %Hu, %Hu}\n", FUNC, indir_rec.addr, indir_rec.len,
-                      indir_rec.id);
-#endif /* QAK */
 
             /* Set pointer to record to insert */
             ins_rec = &indir_rec;
@@ -494,7 +465,6 @@ done:
  * Return:	SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Aug  8 2006
  *
  *-------------------------------------------------------------------------
@@ -586,7 +556,6 @@ done:
  * Return:	SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Aug  8 2006
  *
  *-------------------------------------------------------------------------
@@ -735,7 +704,6 @@ done:
  * Return:	SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Feb 21 2007
  *
  *-------------------------------------------------------------------------
@@ -813,7 +781,6 @@ done:
  * Return:	SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
  *		Sept 11 2006
  *
  *-------------------------------------------------------------------------
@@ -848,7 +815,6 @@ done:
  * Return:	SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
  *		Sept 11 2006
  *
  *-------------------------------------------------------------------------
@@ -883,7 +849,6 @@ done:
  * Return:	SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Aug  8 2006
  *
  *-------------------------------------------------------------------------
@@ -992,7 +957,6 @@ done:
  * Return:	SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Aug  8 2006
  *
  *-------------------------------------------------------------------------
@@ -1055,7 +1019,6 @@ done:
  * Return:	SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Aug  8 2006
  *
  *-------------------------------------------------------------------------