Source formatted

1 files changed, 77 insertions, 94 deletions

diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c
index 3532db7..13fe91e 100644
--- a/src/H5Ddeprec.c
+++ b/src/H5Ddeprec.c
@@ -29,36 +29,31 @@
 /* Module Setup */
 /****************/
 
-#define H5D_PACKAGE		/*suppress error about including H5Dpkg   */
+#define H5D_PACKAGE /*suppress error about including H5Dpkg   */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5D__init_deprec_interface
-
+#define H5_INTERFACE_INIT_FUNC H5D__init_deprec_interface
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Dpkg.h"		/* Datasets 				*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-
+#include "H5private.h"  /* Generic Functions			*/
+#include "H5Dpkg.h"     /* Datasets 				*/
+#include "H5Eprivate.h" /* Error handling		  	*/
+#include "H5Iprivate.h" /* IDs			  		*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -67,23 +62,18 @@
 static herr_t H5D__extend(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5D__init_deprec_interface -- Initialize interface-specific information
@@ -104,7 +94,6 @@ H5D__init_deprec_interface(void)
     FUNC_LEAVE_NOAPI(H5D_init())
 } /* H5D__init_deprec_interface() */
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5D__term_deprec_interface -- Terminate interface
@@ -129,7 +118,7 @@ H5D__term_deprec_interface(void)
 } /* H5D__term_deprec_interface() */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5Dcreate1
  *
@@ -160,49 +149,47 @@ H5D__term_deprec_interface(void)
  *-------------------------------------------------------------------------
  */
 hid_t
-H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
-	  hid_t dcpl_id)
+H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t dcpl_id)
 {
-    H5G_loc_t	    loc;                /* Object location to insert dataset into */
-    H5D_t	   *dset = NULL;        /* New dataset's info */
-    const H5S_t    *space;              /* Dataspace for dataset */
-    hid_t           ret_value;          /* Return value */
+    H5G_loc_t    loc;         /* Object location to insert dataset into */
+    H5D_t *      dset = NULL; /* New dataset's info */
+    const H5S_t *space;       /* Dataspace for dataset */
+    hid_t        ret_value;   /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, dcpl_id);
 
     /* Check arguments */
-    if(H5G_loc(loc_id, &loc) < 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
-    if(H5I_DATATYPE != H5I_get_type(type_id))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype ID")
-    if(NULL == (space = (const H5S_t *)H5I_object_verify(space_id,H5I_DATASPACE)))
+    if (H5G_loc(loc_id, &loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
+    if (!name || !*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
+    if (H5I_DATATYPE != H5I_get_type(type_id))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype ID")
+    if (NULL == (space = (const H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace ID")
-    if(H5P_DEFAULT == dcpl_id)
+    if (H5P_DEFAULT == dcpl_id)
         dcpl_id = H5P_DATASET_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(dcpl_id, H5P_DATASET_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset create property list ID")
+    else if (TRUE != H5P_isa_class(dcpl_id, H5P_DATASET_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset create property list ID")
 
     /* Build and open the new dataset */
-    if(NULL == (dset = H5D__create_named(&loc, name, type_id, space, H5P_LINK_CREATE_DEFAULT, dcpl_id, H5P_DATASET_ACCESS_DEFAULT, H5AC_dxpl_id)))
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset")
+    if (NULL == (dset = H5D__create_named(&loc, name, type_id, space, H5P_LINK_CREATE_DEFAULT, dcpl_id,
+                                          H5P_DATASET_ACCESS_DEFAULT, H5AC_dxpl_id)))
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset")
 
     /* Register the new dataset to get an ID for it */
-    if((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register dataset")
+    if ((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register dataset")
 
 done:
-    if(ret_value < 0)
-        if(dset && H5D_close(dset) < 0)
+    if (ret_value < 0)
+        if (dset && H5D_close(dset) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataset")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dcreate1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dopen1
  *
@@ -223,24 +210,24 @@ done:
 hid_t
 H5Dopen1(hid_t loc_id, const char *name)
 {
-    H5D_t       *dset = NULL;
-    H5G_loc_t	 loc;		        /* Object location of group */
-    H5G_loc_t	 dset_loc;		/* Object location of dataset */
-    H5G_name_t   path;            	/* Dataset group hier. path */
-    H5O_loc_t    oloc;            	/* Dataset object location */
-    H5O_type_t   obj_type;              /* Type of object at location */
-    hbool_t      loc_found = FALSE;     /* Location at 'name' found */
-    hid_t        dapl_id = H5P_DATASET_ACCESS_DEFAULT; /* dapl to use to open dataset */
-    hid_t        dxpl_id = H5AC_ind_dxpl_id;    /* dxpl to use to open datset */
-    hid_t        ret_value;
+    H5D_t *    dset = NULL;
+    H5G_loc_t  loc;                                    /* Object location of group */
+    H5G_loc_t  dset_loc;                               /* Object location of dataset */
+    H5G_name_t path;                                   /* Dataset group hier. path */
+    H5O_loc_t  oloc;                                   /* Dataset object location */
+    H5O_type_t obj_type;                               /* Type of object at location */
+    hbool_t    loc_found = FALSE;                      /* Location at 'name' found */
+    hid_t      dapl_id   = H5P_DATASET_ACCESS_DEFAULT; /* dapl to use to open dataset */
+    hid_t      dxpl_id   = H5AC_ind_dxpl_id;           /* dxpl to use to open datset */
+    hid_t      ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("i", "i*s", loc_id, name);
 
     /* Check args */
-    if(H5G_loc(loc_id, &loc) < 0)
+    if (H5G_loc(loc_id, &loc) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Set up dataset location to fill in */
@@ -249,40 +236,39 @@ H5Dopen1(hid_t loc_id, const char *name)
     H5G_loc_reset(&dset_loc);
 
     /* Find the dataset object */
-    if(H5G_loc_find(&loc, name, &dset_loc, H5P_DEFAULT, dxpl_id) < 0)
+    if (H5G_loc_find(&loc, name, &dset_loc, H5P_DEFAULT, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_NOTFOUND, FAIL, "not found")
     loc_found = TRUE;
 
     /* Check that the object found is the correct type */
-    if(H5O_obj_type(&oloc, &obj_type, dxpl_id) < 0)
+    if (H5O_obj_type(&oloc, &obj_type, dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get object type")
-    if(obj_type != H5O_TYPE_DATASET)
+    if (obj_type != H5O_TYPE_DATASET)
         HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a dataset")
 
     /* Open the dataset */
-    if(NULL == (dset = H5D_open(&dset_loc, dapl_id, dxpl_id)))
+    if (NULL == (dset = H5D_open(&dset_loc, dapl_id, dxpl_id)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't open dataset")
 
     /* Register an atom for the dataset */
-    if((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
+    if ((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "can't register dataset atom")
 
 done:
-    if(ret_value < 0) {
-        if(dset != NULL) {
-            if(H5D_close(dset) < 0)
+    if (ret_value < 0) {
+        if (dset != NULL) {
+            if (H5D_close(dset) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataset")
         } /* end if */
         else {
-            if(loc_found && H5G_loc_free(&dset_loc) < 0)
+            if (loc_found && H5G_loc_free(&dset_loc) < 0)
                 HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't free location")
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dopen1() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5Dextend
  *
@@ -302,27 +288,26 @@ done:
 herr_t
 H5Dextend(hid_t dset_id, const hsize_t size[])
 {
-    H5D_t	*dset;
-    herr_t       ret_value = SUCCEED;  /* Return value */
+    H5D_t *dset;
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*h", dset_id, size);
 
     /* Check args */
-    if(NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
-    if(!size)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no size specified")
+    if (NULL == (dset = (H5D_t *)H5I_object_verify(dset_id, H5I_DATASET)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
+    if (!size)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no size specified")
 
     /* Increase size */
-    if(H5D__extend(dset, size, H5AC_dxpl_id) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to extend dataset")
+    if (H5D__extend(dset, size, H5AC_dxpl_id) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to extend dataset")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Dextend() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__extend
  *
@@ -338,12 +323,12 @@ done:
 static herr_t
 H5D__extend(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id)
 {
-    htri_t changed;                     /* Flag to indicate that the dataspace was successfully extended */
-    H5S_t *space;                       /* Dataset's dataspace */
-    int     rank;                       /* Dataspace # of dimensions */
-    hsize_t curr_dims[H5O_LAYOUT_NDIMS];/* Current dimension sizes */
-    H5O_fill_t *fill;                   /* Dataset's fill value */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    htri_t      changed; /* Flag to indicate that the dataspace was successfully extended */
+    H5S_t *     space;   /* Dataset's dataspace */
+    int         rank;    /* Dataspace # of dimensions */
+    hsize_t     curr_dims[H5O_LAYOUT_NDIMS]; /* Current dimension sizes */
+    H5O_fill_t *fill;                        /* Dataset's fill value */
+    herr_t      ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -352,7 +337,7 @@ H5D__extend(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id)
     HDassert(size);
 
     /* Check if the filters in the DCPL will need to encode, and if so, can they? */
-    if(H5D__check_filters(dataset) < 0)
+    if (H5D__check_filters(dataset) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't apply filters")
 
     /*
@@ -363,32 +348,31 @@ H5D__extend(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id)
 
     /* Retrieve the current dimensions */
     space = dataset->shared->space;
-    if((rank = H5S_get_simple_extent_dims(space, curr_dims, NULL)) < 0)
+    if ((rank = H5S_get_simple_extent_dims(space, curr_dims, NULL)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get dataset dimensions")
 
     /* Increase the size of the data space */
-    if((changed = H5S_extend(space, size)) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to increase size of data space")
+    if ((changed = H5S_extend(space, size)) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to increase size of data space")
 
     /* Updated the dataset's info if the dataspace was successfully extended */
-    if(changed) {
+    if (changed) {
         /* Update the index values for the cached chunks for this dataset */
-        if(H5D_CHUNKED == dataset->shared->layout.type) {
-            if(H5D__chunk_set_info(dataset) < 0)
+        if (H5D_CHUNKED == dataset->shared->layout.type) {
+            if (H5D__chunk_set_info(dataset) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to update # of chunks")
-            if(H5D__chunk_update_cache(dataset, dxpl_id) < 0)
+            if (H5D__chunk_update_cache(dataset, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to update cached chunk indices")
         } /* end if */
 
-	/* Allocate space for the new parts of the dataset, if appropriate */
+        /* Allocate space for the new parts of the dataset, if appropriate */
         fill = &dataset->shared->dcpl_cache.fill;
-        if(fill->alloc_time == H5D_ALLOC_TIME_EARLY)
-            if(H5D__alloc_storage(dataset, dxpl_id, H5D_ALLOC_EXTEND, FALSE,
-                    curr_dims) < 0)
+        if (fill->alloc_time == H5D_ALLOC_TIME_EARLY)
+            if (H5D__alloc_storage(dataset, dxpl_id, H5D_ALLOC_EXTEND, FALSE, curr_dims) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize dataset with fill value")
 
         /* Mark the dataspace as dirty, for later writing to the file */
-        if(H5D__mark(dataset, dxpl_id, H5D_MARK_SPACE) < 0)
+        if (H5D__mark(dataset, dxpl_id, H5D_MARK_SPACE) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to mark dataspace as dirty")
     } /* end if */
 
@@ -396,4 +380,3 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__extend() */
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-