mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-30 16:10:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

removing unneeded function nc4_rec_find_grp

Browse Source
This commit is contained in:
Ed Hartnett 2018-08-21 10:28:44 -06:00
parent 8d0844fa7d
commit 42b9dc778f
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libhdf5/hdf5file.c
View File

@ -469,7 +469,6 @@ NC4_redef(int ncid)
static int
NC4_enddef(int ncid)
{
NC *nc;
NC_FILE_INFO_T *nc4_info;
NC_GRP_INFO_T *grp;
NC_VAR_INFO_T *var;
@ -481,13 +480,6 @@ NC4_enddef(int ncid)
/* Find pointer to group and nc4_info. */
if ((retval = nc4_find_nc_grp_h5(ncid, NULL, &grp, &nc4_info)))
return retval;
/* if (!(nc = nc4_find_nc_file(ncid, &nc4_info))) */
/* return NC_EBADID; */
/* assert(nc4_info); */
/* /\* Find info for this file and group *\/ */
/* if (!(grp = nc4_rec_find_grp(nc4_info, (ncid & GRP_ID_MASK)))) */
/* return NC_EBADGRPID; */
/* When exiting define mode, mark all variable written. */
for (i = 0; i < ncindexsize(grp->vars); i++)

8
libsrc4/nc4internal.c
View File

@ -154,8 +154,10 @@ nc4_find_nc4_grp(int ncid, NC_GRP_INFO_T **grp)
if (h5->cmode & NC_CLASSIC_MODEL) return NC_ESTRICTNC3;
/* If we can't find it, the grp id part of ncid is bad. */
if (!(*grp = nc4_rec_find_grp(h5, (ncid & GRP_ID_MASK))))
if (!(*grp = nclistget(h5->allgroups, (ncid & GRP_ID_MASK))))
return NC_EBADID;
/* if (!(*grp = nc4_rec_find_grp(h5, (ncid & GRP_ID_MASK)))) */
/* return NC_EBADID; */
return NC_NOERR;
}
@ -182,8 +184,10 @@ nc4_find_grp_h5(int ncid, NC_GRP_INFO_T **grpp, NC_FILE_INFO_T **h5p)
if (h5) {
assert(h5->root_grp);
/* If we can't find it, the grp id part of ncid is bad. */
if (!(grp = nc4_rec_find_grp(h5, (ncid & GRP_ID_MASK))))
if (!(grp = nclistget(h5->allgroups, (ncid & GRP_ID_MASK))))
return NC_EBADID;
/* if (!(grp = nc4_rec_find_grp(h5, (ncid & GRP_ID_MASK)))) */
/* return NC_EBADID; */
h5 = (grp)->nc4_info;
assert(h5);
} else {