[svn-r13129] More refactoring. Moved index versions to the index header, so that an

index can be read all at once.  This changes the file format!

Tested on Windows, kagiso, and smirom.

1 files changed, 2 insertions, 14 deletions

diff --git a/src/H5D.c b/src/H5D.c
index ac95d08..090b0c3 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -1195,7 +1195,7 @@ H5D_update_entry_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset)
     /* fill value variables */
     H5D_fill_time_t	fill_time;
     H5O_fill_t		*fill_prop;     /* Pointer to dataset's fill value information */
-    H5O_fill_new_t      fill;
+    H5O_fill_new_t      fill = {NULL, 0, NULL, H5D_ALLOC_TIME_LATE, H5D_FILL_TIME_ALLOC, TRUE};
     H5D_fill_value_t	fill_status;
 
     struct H5O_t       *oh = NULL;      /* Pointer to dataset's object header */
@@ -1218,12 +1218,6 @@ H5D_update_entry_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset)
     /* Get the file's 'use the latest version of the format' flag */
     use_latest_format = H5F_USE_LATEST_FORMAT(file);
 
-    /* Initialize the fill value message */
-    HDmemset(&fill,0,sizeof(H5O_fill_new_t));
-    fill.alloc_time = H5D_ALLOC_TIME_LATE;
-    fill.fill_time = H5D_FILL_TIME_ALLOC;
-    fill.fill_defined = TRUE;
-
     /* Point at dataset's copy, to cache it for later */
     fill_prop = &dset->shared->fill;
     fill_time = dset->shared->fill_time;
@@ -1864,7 +1858,7 @@ done:
 static herr_t
 H5D_open_oid(H5D_t *dataset, hid_t dxpl_id)
 {
-    H5O_fill_new_t  fill;
+    H5O_fill_new_t  fill = {NULL, 0, NULL, H5D_ALLOC_TIME_LATE, H5D_FILL_TIME_IFSET, TRUE};
     unsigned    alloc_time_state;       /* Allocation time state */
     H5O_fill_t     *fill_prop;          /* Pointer to dataset's fill value area */
     H5O_pline_t  pline;                 /* I/O pipeline information */
@@ -1880,12 +1874,6 @@ H5D_open_oid(H5D_t *dataset, hid_t dxpl_id)
     if(NULL == (dataset->shared = H5D_new(H5P_DATASET_CREATE_DEFAULT, FALSE, FALSE)))
         HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
-    /* Initialize the fill value message JAMES: initialize above instead? */
-    HDmemset(&fill,0,sizeof(H5O_fill_new_t));
-    fill.alloc_time = H5D_ALLOC_TIME_LATE;
-    fill.fill_time = H5D_FILL_TIME_IFSET;
-    fill.fill_defined = TRUE;
-
     /* Open the dataset object */
     if(H5O_open(&(dataset->oloc)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "unable to open")