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

cleanup of NC4_abort

Browse Source
This commit is contained in:
Ed Hartnett 2018-08-21 16:40:32 -06:00
parent 8688b9cbf0
commit f4c36b532f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libhdf5/hdf5file.c
View File

@ -564,24 +564,23 @@ int
NC4_abort(int ncid)
{
NC *nc;
NC_FILE_INFO_T *nc4_info;
int delete_file = 0;
char path[NC_MAX_NAME + 1];
int retval = NC_NOERR;
NC_FILE_INFO_T* nc4_info;
int retval;
LOG((2, "%s: ncid 0x%x", __func__, ncid));
/* Find metadata for this file. */
if (!(nc = nc4_find_nc_file(ncid,&nc4_info)))
return NC_EBADID;
if ((retval = nc4_find_nc_grp_h5(ncid, &nc, NULL, &nc4_info)))
return retval;
assert(nc4_info);
/* If we're in define mode, but not redefing the file, delete it. */
if (nc4_info->flags & NC_INDEF && !nc4_info->redef)
{
delete_file++;
strncpy(path, nc->path,NC_MAX_NAME);
strncpy(path, nc->path, NC_MAX_NAME);
}
/* Free any resources the netcdf-4 library has for this file's
@ -594,7 +593,7 @@ NC4_abort(int ncid)
if (remove(path) < 0)
return NC_ECANTREMOVE;
return retval;
return NC_NOERR;
}
/**