mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-27 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleanup and some comments for rec_write_metadata()

Browse Source
This commit is contained in:
Ed Hartnett 2018-12-11 09:33:46 -07:00
parent 8e1d781ea3
commit 28aa22f8cf
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libhdf5/nc4hdf.c
View File

@ -1873,11 +1873,9 @@ nc4_rec_write_metadata(NC_GRP_INFO_T *grp, nc_bool_t bad_coord_order)
/* Set the pointers to the beginning of the list of dims & vars in this /* Set the pointers to the beginning of the list of dims & vars in this
* group. */ * group. */
dim_index = 0; dim = (NC_DIM_INFO_T *)ncindexith(grp->dim, dim_index);
var_index = 0; var = (NC_VAR_INFO_T *)ncindexith(grp->vars, var_index);
/* prime the loop */
dim = (NC_DIM_INFO_T*)ncindexith(grp->dim,dim_index);
var = (NC_VAR_INFO_T*)ncindexith(grp->vars,var_index);
/* Because of HDF5 ordering the dims and vars have to be stored in /* Because of HDF5 ordering the dims and vars have to be stored in
* this way to ensure that the dims and coordinate vars come out in * this way to ensure that the dims and coordinate vars come out in
* the correct order. */ * the correct order. */
@ -1899,7 +1897,7 @@ nc4_rec_write_metadata(NC_GRP_INFO_T *grp, nc_bool_t bad_coord_order)
coord_varid = dim->coord_var->hdr.id; coord_varid = dim->coord_var->hdr.id;
found_coord = NC_TRUE; found_coord = NC_TRUE;
} }
dim = (NC_DIM_INFO_T*)ncindexith(grp->dim,++dim_index); dim = (NC_DIM_INFO_T *)ncindexith(grp->dim, ++dim_index);
} }
/* Write each var. When we get to the coord var we are waiting /* Write each var. When we get to the coord var we are waiting
@ -1910,16 +1908,19 @@ nc4_rec_write_metadata(NC_GRP_INFO_T *grp, nc_bool_t bad_coord_order)
return retval; return retval;
if (found_coord && var->hdr.id == coord_varid) if (found_coord && var->hdr.id == coord_varid)
wrote_coord = NC_TRUE; wrote_coord = NC_TRUE;
var = (NC_VAR_INFO_T*)ncindexith(grp->vars,++var_index); var = (NC_VAR_INFO_T *)ncindexith(grp->vars, ++var_index);
} }
} /* end while */ } /* end while */
/* Attach dimscales to vars in this group. */
if ((retval = attach_dimscales(grp))) if ((retval = attach_dimscales(grp)))
return retval; return retval;
/* If there are any child groups, write their metadata. */ /* If there are any child groups, write their metadata. */
for(i=0;i<ncindexsize(grp->children);i++) { for (i = 0; i < ncindexsize(grp->children); i++)
if((child_grp = (NC_GRP_INFO_T*)ncindexith(grp->children,i)) == NULL) continue; {
child_grp = (NC_GRP_INFO_T *)ncindexith(grp->children, i);
assert(child_grp);
if ((retval = nc4_rec_write_metadata(child_grp, bad_coord_order))) if ((retval = nc4_rec_write_metadata(child_grp, bad_coord_order)))
return retval; return retval;
} }