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

free hdf5-specific var info and cleanup

Browse Source
This commit is contained in:
Ed Hartnett 2018-11-13 05:58:54 -07:00
parent f7cb5ead1c
commit ce43b7d772
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libsrc4/nc4internal.c
View File

@ -1182,7 +1182,6 @@ var_free(NC_VAR_INFO_T *var)
return retval;
ncindexfree(var->att);
/* Free some things that may be allocated. */
/* Free some things that may be allocated. */
if (var->chunksizes)
free(var->chunksizes);
@ -1233,6 +1232,10 @@ var_free(NC_VAR_INFO_T *var)
if (var->params)
free(var->params);
/* Delete any format-specific info. */
if (var->format_var_info)
free(var->format_var_info);
/* Delete the var. */
free(var);
@ -1242,26 +1245,24 @@ var_free(NC_VAR_INFO_T *var)
/**
* @internal Delete a var, and free the memory.
*
* @param grp the containing group
* @param grp Pointer to the strct for the containing group.
* @param var Pointer to the var info struct of var to delete.
*
* @return ::NC_NOERR No error.
* @author Ed Hartnett, Dennis Heimbigner
*/
int
nc4_var_list_del(NC_GRP_INFO_T* grp, NC_VAR_INFO_T *var)
nc4_var_list_del(NC_GRP_INFO_T *grp, NC_VAR_INFO_T *var)
{
int i;
if(var == NULL)
return NC_NOERR;
assert(var && grp);
/* Remove from lists */
if(grp) {
i = ncindexfind(grp->vars,(NC_OBJ*)var);
if(i >= 0)
ncindexidel(grp->vars, i);
}
i = ncindexfind(grp->vars, (NC_OBJ *)var);
if (i >= 0)
ncindexidel(grp->vars, i);
return var_free(var);
}