whitespace cleanup of hdf5open.c, plus extra documentation
@@ -636,28 +636,28 @@ check_for_classic_model(NC_GRP_INFO_T *root_grp, int *is_classic)
static int
nc4_open_file(const char *path, int mode, void* parameters, NC *nc)
{
+ NC_FILE_INFO_T *nc4_info = NULL;
+ NC_HDF5_FILE_INFO_T *h5 = NULL;
hid_t fapl_id = H5P_DEFAULT;
- int retval;
unsigned flags;
- NC_FILE_INFO_T *nc4_info = NULL;
int is_classic;
- NC_HDF5_FILE_INFO_T *h5 = NULL;
-
#ifdef USE_PARALLEL4
NC_MPI_INFO* mpiinfo = NULL;
int comm_duped = 0; /* Whether the MPI Communicator was duplicated */
int info_duped = 0; /* Whether the MPI Info object was duplicated */
#endif
+ int retval;
LOG((3, "%s: path %s mode %d", __func__, path, mode));
assert(path && nc);
+ /* Determine the HDF5 open flag to use. */
flags = (mode & NC_WRITE) ? H5F_ACC_RDWR : H5F_ACC_RDONLY;
/* Add necessary structs to hold netcdf-4 file data. */
if ((retval = nc4_nc4f_list_add(nc, path, mode)))
BAIL(retval);
- nc4_info = NC4_DATA(nc);
+ nc4_info = (NC_FILE_INFO_T *)nc->dispatchdata;
assert(nc4_info && nc4_info->root_grp);
/* Add struct to hold HDF5-specific file metadata. */
