mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-18 15:55:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed HDF4 abort warning

Browse Source
This commit is contained in:
Ed Hartnett 2019-01-02 05:58:54 -07:00
parent 00a43c5374
commit 6416abe887
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/hdf4dispatch.h
View File

@ -40,10 +40,13 @@ extern "C" {
extern int
NC_HDF4_open(const char *path, int mode, int basepe, size_t *chunksizehintp,
void* parameters, NC_Dispatch*, NC*);
void *parameters, NC_Dispatch *, NC *);
extern int
NC_HDF4_close(int ncid);
NC_HDF4_abort(int ncid);
extern int
NC_HDF4_close(int ncid, void *ignore);
extern int
NC_HDF4_inq_format(int ncid, int *formatp);

2
libhdf4/hdf4dispatch.c
View File

@ -24,7 +24,7 @@ NC_HDF4_open,
NC_RO_redef,
NC_RO__enddef,
NC_RO_sync,
NC_HDF4_close,
NC_HDF4_abort,
NC_HDF4_close,
NC_RO_set_fill,
NC_NOTNC3_inq_base_pe,

20
libhdf4/hdf4file.c
View File

@ -662,7 +662,7 @@ NC_HDF4_open(const char *path, int mode, int basepe, size_t *chunksizehintp,
}
/**
* @internal Close the HDF4 file.
* @internal Abort (close) the HDF4 file.
*
* @param ncid File ID.
*
@ -671,7 +671,23 @@ NC_HDF4_open(const char *path, int mode, int basepe, size_t *chunksizehintp,
* @author Ed Hartnett
*/
int
NC_HDF4_close(int ncid)
NC_HDF4_abort(int ncid)
{
return NC_HDF4_close(ncid, NULL);
}
/**
* @internal Close the HDF4 file.
*
* @param ncid File ID.
* @param ignore Ignore this pointer.
*
* @return ::NC_NOERR No error.
* @return ::NC_EBADID Bad ncid.
* @author Ed Hartnett
*/
int
NC_HDF4_close(int ncid, void *ignore)
{
NC_GRP_INFO_T *grp;
NC *nc;