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

rest of removal of lazy att code from libsrc4

Browse Source
This commit is contained in:
Ed Hartnett 2018-11-26 11:11:56 -07:00
parent 016f675fad
commit f9d3fff2c3
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libhdf5/hdf5dispatch.c
View File

@ -56,7 +56,7 @@ NC4_put_vars,
NCDEFAULT_get_varm,
NCDEFAULT_put_varm,
NC4_inq_var_all,
NC4_HDF5_inq_var_all,
NC4_var_par_access,
NC4_def_var_fill,

20
libsrc4/nc4var.c
View File

@ -251,23 +251,14 @@ NC4_inq_var_all(int ncid, int varid, char *name, nc_type *xtypep,
/* Walk through the list of vars, and return the info about the one
with a matching varid. If the varid is -1, find the global
atts and call it a day. */
if (varid == NC_GLOBAL)
if (varid == NC_GLOBAL && nattsp)
{
if (nattsp)
{
/* Do we need to read the atts? */
if (grp->atts_not_read)
if ((retval = nc4_read_atts(grp, NULL)))
return retval;
*nattsp = ncindexcount(grp->att);
}
*nattsp = ncindexcount(grp->att);
return NC_NOERR;
}
/* Find the var. */
var = (NC_VAR_INFO_T*)ncindexith(grp->vars,varid);
if(!var)
if (!(var = (NC_VAR_INFO_T *)ncindexith(grp->vars, varid)))
return NC_ENOTVAR;
assert(var && var->hdr.id == varid);
@ -282,12 +273,7 @@ NC4_inq_var_all(int ncid, int varid, char *name, nc_type *xtypep,
for (d = 0; d < var->ndims; d++)
dimidsp[d] = var->dimids[d];
if (nattsp)
{
if (var->atts_not_read)
if ((retval = nc4_read_atts(grp, var)))
return retval;
*nattsp = ncindexcount(var->att);
}
/* Chunking stuff. */
if (!var->contiguous && chunksizesp)