TRILAB-192 merging warnings changes from develop

1 files changed, 107 insertions, 106 deletions

diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index a1b29d5..bc7391c 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -54,6 +54,7 @@
 /********************/
 static herr_t H5F__super_ext_create(H5F_t *f, H5O_loc_t *ext_ptr);
 static herr_t H5F__update_super_ext_driver_msg(H5F_t *f);
+herr_t H5O__fsinfo_set_version(H5F_t *f, H5O_fsinfo_t *fsinfo);
 
 
 /*********************/
@@ -88,7 +89,7 @@ static const unsigned H5O_fsinfo_ver_bounds[] = {
     H5O_FSINFO_VERSION_LATEST       /* H5F_LIBVER_LATEST */
 };
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5F__super_ext_create
  *
@@ -141,7 +142,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F__super_ext_create() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5F_super_ext_open
  *
@@ -179,7 +180,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F_super_ext_open() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:   H5F__super_ext_close
  *
@@ -232,14 +233,14 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F__super_ext_close() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5F__update_super_ext_driver_msg
  *
- * Purpose:     Update the superblock extension file driver info message if 
+ * Purpose:     Update the superblock extension file driver info message if
  *              we are using a V 2 superblock.  Observe that the function
  *              is a NO-OP if the file driver info message does not exist.
- *              This is necessary, as the function is called whenever the 
+ *              This is necessary, as the function is called whenever the
  *              EOA is updated, and were it to create the file driver info
  *              message, it would find itself in an infinite recursion.
  *
@@ -279,8 +280,8 @@ H5F__update_super_ext_driver_msg(H5F_t *f)
                 /* Check for driver info */
                 H5_CHECKED_ASSIGN(driver_size, size_t, H5FD_sb_size(f->shared->lf), hsize_t);
 
-                /* Nothing to do unless there is both driver info and 
-                 * the driver info superblock extension message has 
+                /* Nothing to do unless there is both driver info and
+                 * the driver info superblock extension message has
                  * already been created.
                  */
                 if(driver_size > 0) {
@@ -296,7 +297,7 @@ H5F__update_super_ext_driver_msg(H5F_t *f)
 
                     /* Write the message to the superblock extension.
                      *
-                     * Note that the superblock extension and the 
+                     * Note that the superblock extension and the
                      * file driver info message must already exist.
                      */
                     drvinfo.len = driver_size;
@@ -312,7 +313,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F__update_super_ext_driver_msg() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5F__super_read
  *
@@ -351,7 +352,7 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
     FUNC_ENTER_PACKAGE_TAG(H5AC__SUPERBLOCK_TAG)
 
     /* initialize the drvinfo to NULL -- we will overwrite this if there
-     * is a driver information block 
+     * is a driver information block
      */
     f->shared->drvinfo = NULL;
 
@@ -443,7 +444,7 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
         HGOTO_ERROR(H5E_FILE, H5E_BADTYPE, FAIL, "can't get property list")
 
     /* Make certain we can read the fixed-size portion of the superblock */
-    if(H5F__set_eoa(f, H5FD_MEM_SUPER, 
+    if(H5F__set_eoa(f, H5FD_MEM_SUPER,
               (haddr_t)(H5F_SUPERBLOCK_FIXED_SIZE + H5F_SUPERBLOCK_MINIMAL_VARLEN_SIZE)) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTSET, FAIL, "set end of space allocation request failed")
 
@@ -463,12 +464,12 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
     if(NULL == (sblock = (H5F_super_t *)H5AC_protect(f, H5AC_SUPERBLOCK, (haddr_t)0, &udata, rw_flags)))
         HGOTO_ERROR(H5E_FILE, H5E_CANTPROTECT, FAIL, "unable to load superblock")
 
-    /* 
+    /*
      * When opening a file with SWMR-write access, the library will first
-     * check to ensure that superblock version 3 is used.  Otherwise fail 
+     * check to ensure that superblock version 3 is used.  Otherwise fail
      * file open.
      *
-     * Then the library will upgrade the file's low_bound depending on 
+     * Then the library will upgrade the file's low_bound depending on
      * superblock version as follows:
      *      --version 0 or 1: no change to low_bound
      *      --version 2: upgrade low_bound to at least V18
@@ -601,8 +602,8 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
      * as the file can appear truncated if only part of it has been
      * been flushed to disk by the SWMR writer process.
      */
-    /* The EOF check is also skipped when the private property 
-     * H5F_ACS_SKIP_EOF_CHECK_NAME exists in the fapl.  
+    /* The EOF check is also skipped when the private property
+     * H5F_ACS_SKIP_EOF_CHECK_NAME exists in the fapl.
      * This property is enabled by the tool h5clear with these
      * two options: (1) --filesize (2) --increment
      */
@@ -613,7 +614,7 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get skip EOF check value")
 
     if(H5F_INTENT(f) & H5F_ACC_SWMR_READ) {
-        /* 
+        /*
          * When the file is opened for SWMR read access, skip the check if:
          * --the file is already marked for SWMR writing and
          * --the file has version 3 superblock for SWMR support
@@ -655,10 +656,10 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
         drvrinfo_udata.f           = f;
         drvrinfo_udata.driver_addr = sblock->driver_addr;
 
-        /* extend EOA so we can read at least the fixed sized 
-         * portion of the driver info block 
+        /* extend EOA so we can read at least the fixed sized
+         * portion of the driver info block
          */
-        if(H5FD_set_eoa(f->shared->lf, H5FD_MEM_SUPER, sblock->driver_addr + H5F_DRVINFOBLOCK_HDR_SIZE) < 0) /* will extend eoa later if required */ 
+        if(H5FD_set_eoa(f->shared->lf, H5FD_MEM_SUPER, sblock->driver_addr + H5F_DRVINFOBLOCK_HDR_SIZE) < 0) /* will extend eoa later if required */
             HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "set end of space allocation request failed")
 
         /* Look up the driver info block */
@@ -671,7 +672,7 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
         if(((rw_flags & H5AC__READ_ONLY_FLAG) == 0) && H5F_HAS_FEATURE(f, H5FD_FEAT_DIRTY_DRVRINFO_LOAD))
             drvinfo_flags |= H5AC__DIRTIED_FLAG;
 
-        /* set the pin entry flag so that the driver information block 
+        /* set the pin entry flag so that the driver information block
          * cache entry will be pinned in the cache.
          */
         drvinfo_flags |= H5AC__PIN_ENTRY_FLAG;
@@ -857,7 +858,7 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
 
                 /* As "eoa_pre_fsm_fsalloc" may be undefined for a crashed file
                  * with persistent free space managers, therefore, set
-                 * "first_alloc_dealloc" when the condition 
+                 * "first_alloc_dealloc" when the condition
                  * "dropping free-space to the floor is true.
                  * This will ensure that no action is done to settle things on file
                  * close via H5MF_settle_meta_data_fsm() and H5MF_settle_raw_data_fsm().
@@ -871,9 +872,9 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
                     f->shared->fs_addr[u] = fsinfo.fs_addr[u - 1];
 
                 /* If the following two conditions are true:
-                 *      (1) file is persisting free-space 
+                 *      (1) file is persisting free-space
                  *      (2) dropping free-space to the floor (null_fsm_addr)
-                 * nullify the addresses of the FSMs 
+                 * nullify the addresses of the FSMs
                  */
                 if(f->shared->fs_persist && null_fsm_addr)
                     for(u = 0; u < NELMTS(fsinfo.fs_addr); u++)
@@ -888,7 +889,7 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
 #if 1 /* bug fix test code -- tidy this up if all goes well */ /* JRM */
                     /* KLUGE ALERT!!
                      *
-                     * H5F__super_ext_write_msg() expects f->shared->sblock to 
+                     * H5F__super_ext_write_msg() expects f->shared->sblock to
                      * be set -- verify that it is NULL, and then set it.
                      * Set it back to NULL when we are done.
                      */
@@ -925,12 +926,12 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
             /* if the metadata cache image superblock extension message exists,
              * read its contents and pass the data on to the metadata cache.
              * Given this data, the cache will load and decode the metadata
-             * cache image block, decoded it and load its contents into the 
-             * the cache on the test protect call.  
+             * cache image block, decoded it and load its contents into the
+             * the cache on the test protect call.
              *
-             * Further, if the file is opened R/W, the metadata cache will 
+             * Further, if the file is opened R/W, the metadata cache will
              * delete the metadata cache image superblock extension and free
-             * the cache image block.  Don't do this now as f->shared 
+             * the cache image block.  Don't do this now as f->shared
              * is not fully setup, which complicates matters.
              */
 
@@ -979,20 +980,20 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read)
                 /* Write driver info information to the superblock extension */
 
 #if 1 /* bug fix test code -- tidy this up if all goes well */ /* JRM */
-		/* KLUGE ALERT!!
-		 *
-		 * H5F__super_ext_write_msg() expects f->shared->sblock to 
-		 * be set -- verify that it is NULL, and then set it.
-		 * Set it back to NULL when we are done.
-		 */
-		HDassert(f->shared->sblock == NULL);
-		f->shared->sblock = sblock;
+        /* KLUGE ALERT!!
+        *
+        * H5F__super_ext_write_msg() expects f->shared->sblock to
+        * be set -- verify that it is NULL, and then set it.
+        * Set it back to NULL when we are done.
+        */
+        HDassert(f->shared->sblock == NULL);
+        f->shared->sblock = sblock;
 #endif /* JRM */
-		if(H5F__super_ext_write_msg(f, H5O_DRVINFO_ID, &drvinfo, FALSE, H5O_MSG_NO_FLAGS_SET) < 0)
+        if(H5F__super_ext_write_msg(f, H5O_DRVINFO_ID, &drvinfo, FALSE, H5O_MSG_NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, FAIL, "error in writing message to superblock extension")
 
 #if 1 /* bug fix test code -- tidy this up if all goes well */ /* JRM */
-		f->shared->sblock = NULL;
+        f->shared->sblock = NULL;
 #endif /* JRM */
 
             } /* end if */
@@ -1025,10 +1026,10 @@ done:
     if(sblock && H5AC_unprotect(f, H5AC_SUPERBLOCK, (haddr_t)0, sblock, sblock_flags) < 0)
         HDONE_ERROR(H5E_FILE, H5E_CANTUNPROTECT, FAIL, "unable to close superblock")
 
-    /* If we have failed, make sure no entries are left in the 
+    /* If we have failed, make sure no entries are left in the
      * metadata cache, so that it can be shut down and discarded.
      */
-    if(ret_value < 0) { 
+    if(ret_value < 0) {
         /* Unpin and discard drvinfo cache entry */
         if(f->shared->drvinfo) {
             if(H5AC_unpin_entry(f->shared->drvinfo) < 0)
@@ -1054,7 +1055,7 @@ done:
     FUNC_LEAVE_NOAPI_TAG(ret_value)
 } /* end H5F__super_read() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5F__super_init
  *
@@ -1118,10 +1119,10 @@ H5F__super_init(H5F_t *f)
     if(!(f->shared->fs_strategy == H5F_FILE_SPACE_STRATEGY_DEF &&
             f->shared->fs_persist == H5F_FREE_SPACE_PERSIST_DEF &&
             f->shared->fs_threshold == H5F_FREE_SPACE_THRESHOLD_DEF &&
-	    f->shared->fs_page_size == H5F_FILE_SPACE_PAGE_SIZE_DEF))
+        f->shared->fs_page_size == H5F_FILE_SPACE_PAGE_SIZE_DEF))
         non_default_fs_settings = TRUE;
 
-    /* 
+    /*
      * When creating a file with write access, the library will:
      *      -- set superblock version to 0, 1 or 2 based on feature enabled
      *      -- no change to low_bound
@@ -1130,9 +1131,9 @@ H5F__super_init(H5F_t *f)
      *      -- set superblock version to 3
      *      -- upgrade low_bound to at least V110
      *
-     * Then the library will finalize superblock version to that allowed by 
+     * Then the library will finalize superblock version to that allowed by
      * low_bound if that is higher.
-     * Lastly, the library will check to ensure the superblock version does not 
+     * Lastly, the library will check to ensure the superblock version does not
      * exceed the version allowed by high_bound. Otherwise fail file open.
      *
      * For details, please see RFC:Setting Bounds for Object Creation in HDF5 1.10.0.
@@ -1142,12 +1143,12 @@ H5F__super_init(H5F_t *f)
      * the status_flags field in the superblock. The problem is discussed in
      * jira issue SWMR-79 and also in the RFC: File Format Changes in HDF5 1.10.0.
      * The file's low_bound is upgraded for SWMR so that the library will
-     * use the best format versions available in 1.10.  
-     * Due to the possible upgrade, the fapl returned from H5Fget_access_plist() 
+     * use the best format versions available in 1.10.
+     * Due to the possible upgrade, the fapl returned from H5Fget_access_plist()
      * might indicate a low_bound higher than what the user originally set.
      */
 
-    /* 
+    /*
      * Creating a file with SWMR-write access will
      * upgrade superblock version and low_bound
      */
@@ -1158,10 +1159,10 @@ H5F__super_init(H5F_t *f)
     /* Bump superblock version to create superblock extension for SOHM info */
     } else if(f->shared->sohm_nindexes > 0)
         super_vers = HDF5_SUPERBLOCK_VERSION_2;
-    /* 
-     *	Bump superblock version to create superblock extension for:
-     * 	-- non-default file space strategy or 
-     * 	-- non-default persisting free-space or 
+    /*
+     *    Bump superblock version to create superblock extension for:
+     *     -- non-default file space strategy or
+     *     -- non-default persisting free-space or
      *  -- non-default free-space threshold or
      *  -- non-default page_size
      */
@@ -1238,7 +1239,7 @@ H5F__super_init(H5F_t *f)
     /* Compute the size of the driver information block */
     H5_CHECKED_ASSIGN(driver_size, size_t, H5FD_sb_size(f->shared->lf), hsize_t);
 
-    /* The following code sets driver_size to the valued needed 
+    /* The following code sets driver_size to the valued needed
      * for the driver info block, and sets the driver info block
      * address regardless of the version of the superblock.
      */
@@ -1279,7 +1280,7 @@ H5F__super_init(H5F_t *f)
 
     /* Allocate space for the superblock */
     if(HADDR_UNDEF == H5MF_alloc(f, H5FD_MEM_SUPER, superblock_size))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for superblock")
+    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for superblock")
 
     /* set the drvinfo filed to NULL -- will overwrite this later if needed */
     f->shared->drvinfo = NULL;
@@ -1330,7 +1331,7 @@ H5F__super_init(H5F_t *f)
          * be tuned if more information is added to the superblock
          * extension.
          */
-	if(H5F__super_ext_create(f, &ext_loc) < 0)
+    if(H5F__super_ext_create(f, &ext_loc) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTCREATE, FAIL, "unable to create superblock extension")
         ext_created = TRUE;
 
@@ -1403,7 +1404,7 @@ H5F__super_init(H5F_t *f)
 
             if(H5O_msg_create(&ext_loc, H5O_FSINFO_ID, H5O_MSG_FLAG_DONTSHARE | H5O_MSG_FLAG_MARK_IF_UNKNOWN, H5O_UPDATE_TIME, &fsinfo) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to update free-space info header message")
-	} /* end if */
+    } /* end if */
     } /* end if */
     else {
         /* Check for creating an "old-style" driver info block */
@@ -1486,7 +1487,7 @@ done:
     FUNC_LEAVE_NOAPI_TAG(ret_value)
 } /* end H5F__super_init() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5F_eoa_dirty
  *
@@ -1516,8 +1517,8 @@ H5F_eoa_dirty(H5F_t *f)
     if(H5F_super_dirty(f) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTMARKDIRTY, FAIL, "unable to mark superblock as dirty")
 
-    /* If the driver information block exists, mark it dirty as well 
-     * so that the change in eoa will be reflected there as well if 
+    /* If the driver information block exists, mark it dirty as well
+     * so that the change in eoa will be reflected there as well if
      * appropriate.
      */
     if(f->shared->drvinfo) {
@@ -1533,7 +1534,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F_eoa_dirty() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5F_super_dirty
  *
@@ -1567,7 +1568,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F_super_dirty() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5F__super_free
  *
@@ -1598,7 +1599,7 @@ H5F__super_free(H5F_super_t *sblock)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5F__super_free() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5F__super_size
  *
@@ -1627,7 +1628,7 @@ H5F__super_size(H5F_t *f, hsize_t *super_size, hsize_t *super_ext_size)
 
     /* Set the superblock size */
     if(super_size)
-	*super_size = (hsize_t)H5F_SUPERBLOCK_SIZE(f->shared->sblock);
+    *super_size = (hsize_t)H5F_SUPERBLOCK_SIZE(f->shared->sblock);
 
     /* Set the superblock extension size */
     if(super_ext_size) {
@@ -1663,7 +1664,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F__super_size() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5F__super_ext_write_msg()
  *
@@ -1682,9 +1683,9 @@ H5F__super_ext_write_msg(H5F_t *f, unsigned id, void *mesg,
     H5AC_ring_t orig_ring = H5AC_RING_INV;      /* Original ring value */
     hbool_t     ext_created = FALSE;   /* Whether superblock extension was created */
     hbool_t     ext_opened = FALSE;    /* Whether superblock extension was opened */
-    H5O_loc_t 	ext_loc; 	/* "Object location" for superblock extension */
-    htri_t 	status;       	/* Indicate whether the message exists or not */
-    herr_t 	ret_value = SUCCEED;         /* Return value */
+    H5O_loc_t     ext_loc;     /* "Object location" for superblock extension */
+    htri_t     status;           /* Indicate whether the message exists or not */
+    herr_t     ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1703,8 +1704,8 @@ H5F__super_ext_write_msg(H5F_t *f, unsigned id, void *mesg,
     } /* end if */
     else {
         HDassert(may_create);
-	if(H5F__super_ext_create(f, &ext_loc) < 0)
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTCREATE, FAIL, "unable to create file's superblock extension")
+    if(H5F__super_ext_create(f, &ext_loc) < 0)
+        HGOTO_ERROR(H5E_FILE, H5E_CANTCREATE, FAIL, "unable to create file's superblock extension")
         ext_created = TRUE;
     } /* end else */
     HDassert(H5F_addr_defined(ext_loc.addr));
@@ -1712,24 +1713,24 @@ H5F__super_ext_write_msg(H5F_t *f, unsigned id, void *mesg,
 
     /* Check if message with ID does not exist in the object header */
     if((status = H5O_msg_exists(&ext_loc, id)) < 0)
-	HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to check object header for message or message exists")
+    HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to check object header for message or message exists")
 
     /* Check for creating vs. writing */
     if(may_create) {
         if(status)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "Message should not exist")
 
-	/* Create the message with ID in the superblock extension */
-	if(H5O_msg_create(&ext_loc, id, (mesg_flags | H5O_MSG_FLAG_DONTSHARE), H5O_UPDATE_TIME, mesg) < 0)
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to create the message in object header")
+    /* Create the message with ID in the superblock extension */
+    if(H5O_msg_create(&ext_loc, id, (mesg_flags | H5O_MSG_FLAG_DONTSHARE), H5O_UPDATE_TIME, mesg) < 0)
+        HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to create the message in object header")
     } /* end if */
     else {
         if(!status)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "Message should exist")
 
-	/* Update the message with ID in the superblock extension */
-	if(H5O_msg_write(&ext_loc, id, (mesg_flags | H5O_MSG_FLAG_DONTSHARE), H5O_UPDATE_TIME, mesg) < 0)
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to write the message in object header")
+    /* Update the message with ID in the superblock extension */
+    if(H5O_msg_write(&ext_loc, id, (mesg_flags | H5O_MSG_FLAG_DONTSHARE), H5O_UPDATE_TIME, mesg) < 0)
+        HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to write the message in object header")
     } /* end else */
 
 done:
@@ -1748,7 +1749,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F__super_ext_write_msg() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5F__super_ext_remove_msg
  *
@@ -1764,11 +1765,11 @@ herr_t
 H5F__super_ext_remove_msg(H5F_t *f, unsigned id)
 {
     H5AC_ring_t orig_ring = H5AC_RING_INV;      /* Original ring value */
-    H5O_loc_t 	ext_loc; 	/* "Object location" for superblock extension */
+    H5O_loc_t     ext_loc;     /* "Object location" for superblock extension */
     hbool_t     ext_opened = FALSE;     /* Whether the superblock extension was opened */
-    int		null_count = 0;	/* # of null messages */
+    int        null_count = 0;    /* # of null messages */
     htri_t      status;         /* Indicate whether the message exists or not */
-    herr_t 	ret_value = SUCCEED;         /* Return value */
+    herr_t     ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -1780,34 +1781,34 @@ H5F__super_ext_remove_msg(H5F_t *f, unsigned id)
 
     /* Open superblock extension object header */
     if(H5F_super_ext_open(f, f->shared->sblock->ext_addr, &ext_loc) < 0)
-	HGOTO_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "error in starting file's superblock extension")
+    HGOTO_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "error in starting file's superblock extension")
     ext_opened = TRUE;
 
     /* Check if message with ID exists in the object header */
     if((status = H5O_msg_exists(&ext_loc, id)) < 0)
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to check object header for message")
+    HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to check object header for message")
     else if(status) { /* message exists */
-	H5O_hdr_info_t 	hdr_info;       /* Object header info for superblock extension */
-
-	/* Remove the message */
-	if(H5O_msg_remove(&ext_loc, id, H5O_ALL, TRUE) < 0)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to delete free-space manager info message")
-
-	/* Get info for the superblock extension's object header */
-	if(H5O_get_hdr_info(&ext_loc, &hdr_info) < 0)
-	    HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to retrieve superblock extension info")
-
-	/* If the object header is an empty base chunk, remove superblock extension */
-	if(hdr_info.nchunks == 1) {
-	    if((null_count = H5O_msg_count(&ext_loc, H5O_NULL_ID)) < 0)
-		HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "unable to count messages")
-	    else if((unsigned)null_count == hdr_info.nmesgs) {
-		HDassert(H5F_addr_defined(ext_loc.addr));
-		if(H5O_delete(f, ext_loc.addr) < 0)
-		    HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "unable to count messages")
-		f->shared->sblock->ext_addr = HADDR_UNDEF;
-	    } /* end if */
-	} /* end if */
+    H5O_hdr_info_t     hdr_info;       /* Object header info for superblock extension */
+
+    /* Remove the message */
+    if(H5O_msg_remove(&ext_loc, id, H5O_ALL, TRUE) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to delete free-space manager info message")
+
+    /* Get info for the superblock extension's object header */
+    if(H5O_get_hdr_info(&ext_loc, &hdr_info) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to retrieve superblock extension info")
+
+    /* If the object header is an empty base chunk, remove superblock extension */
+    if(hdr_info.nchunks == 1) {
+        if((null_count = H5O_msg_count(&ext_loc, H5O_NULL_ID)) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "unable to count messages")
+        else if((unsigned)null_count == hdr_info.nmesgs) {
+        HDassert(H5F_addr_defined(ext_loc.addr));
+        if(H5O_delete(f, ext_loc.addr) < 0)
+            HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "unable to count messages")
+        f->shared->sblock->ext_addr = HADDR_UNDEF;
+        } /* end if */
+    } /* end if */
     } /* end if */
 
 done:
@@ -1822,7 +1823,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5F__super_ext_remove_msg() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5O__fsinfo_set_version
  *