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

removed unneeded h5 checks

Browse Source
This commit is contained in:
Ed Hartnett 2018-01-18 07:46:31 -07:00
parent 126d34da1d
commit d350f82889
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc4/nc4type.c
View File

@ -217,9 +217,10 @@ NC4_inq_typeids(int ncid, int *ntypes, int *typeids)
/* Find info for this file and group, and set pointer to each. */
if ((retval = nc4_find_grp_h5(ncid, &grp, &h5)))
return retval;
assert(h5 && grp);
/* If this is a netCDF-4 file, count types. */
if (h5 && grp->type)
/* Count types. */
if (grp->type)
for (type = grp->type; type; type = type->l.next)
{
if (typeids)
@ -631,8 +632,9 @@ find_nc4_file(int ncid, NC **nc)
NC_HDF5_FILE_INFO_T* h5;
/* Find file metadata. */
if (!((*nc) = nc4_find_nc_file(ncid,&h5)))
if (!((*nc) = nc4_find_nc_file(ncid, &h5)))
return NC_EBADID;
assert(h5);
if (h5->cmode & NC_CLASSIC_MODEL)
return NC_ESTRICTNC3;