[svn-r18649] Description:

	Minor tweaks to align w/code on trunk better.

Tested on:
	Mac OS X/32 10.6.3 (amazon) w/debug & production
	(too minor to require h5committest)

6 files changed, 3 insertions, 23 deletions

diff --git a/src/H5Dbtree.c b/src/H5Dbtree.c
index 79f7789..54d853c 100644
--- a/src/H5Dbtree.c
+++ b/src/H5Dbtree.c
@@ -1349,10 +1349,6 @@ done:
  * Programmer:	Quincey Koziol
  *              Thursday, January 15, 2009
  *
- * Modifications:
- *	Vailin Choi; April 2009
- *	Reset address of the chunked storage index if RESET_ADDR is set
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index c7baa65..e10fd52 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -369,10 +369,6 @@ done:
  * Programmer:	Quincey Koziol
  *              Thursday, May 22, 2008
  *
- * Modifications:
- *	Vailin Choi; April 2009
- * 	Reset address and pointer of the array struct for the chunked storage index
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -2056,10 +2052,6 @@ done:
  *
  * Programmer:	Quincey Koziol
  *              Thursday, January 15, 2009
- * 
- * Modifications:
- *	Vailin Choi; April 2009
- *	Pass along RESET_ADDR: whether to reset the address of chunked storage index
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c
index f0836e9..64d2f03 100644
--- a/src/H5Oalloc.c
+++ b/src/H5Oalloc.c
@@ -1130,7 +1130,7 @@ H5O_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
     /* Compute the size needed to store the message in the object header */
     raw_size = (type->raw_size)(f, FALSE, mesg);
     if(0 == raw_size)
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, UFAIL, "can't compute object header message size")
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "can't compute object header message size")
     if(raw_size >= H5O_MESG_MAX_SIZE)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "object header message is too large")
     aligned_size = H5O_ALIGN_OH(oh, raw_size);
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index 2b55f53..448e4bf 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -543,10 +543,6 @@ done:
  * Programmer:  Robb Matzke
  *              Wednesday, October  8, 1997
  *
- * Modifications:
- *      Vailin Choi; April 2009
- *      Reset the pointer of the chunked storage index but not the address
- *
  *-------------------------------------------------------------------------
  */
 static void *
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 0f16fd3..21fbdee 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -219,10 +219,6 @@ done:
  * Programmer:     Raymond Lu
  *                 Tuesday, October 2, 2001
  *
- * Modifications:
- *      Vailin Choi; April 2009
- *      Reset address and pointer of the array struct for the chunked storage index
- *
  *-------------------------------------------------------------------------
  */
 /* ARGSUSED */
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index 8208c0e..d6998d0 100644
--- a/tools/h5repack/h5repack_main.c
+++ b/tools/h5repack/h5repack_main.c
@@ -108,8 +108,8 @@ int main(int argc, const char **argv)
     int           ret=-1;
 
     /* initialize options  */
-    h5repack_init (&options, 0, 0, 0, (hsize_t)0);        
-    
+    h5repack_init(&options, 0, 0, 0, (hsize_t)0);
+
     parse_command_line(argc, argv, &options);
 
     /* get file names if they were not yet got */