Blob Blame Raw
From 376e966ff9333e43a77e6ddf1cebbef1032a8e61 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Sat, 7 Nov 2015 15:46:23 +0100
Subject: [PATCH 2/2] rename hdf_close to hdf_fclose due to first exposed in
 netcdf

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
 libsrc/hdf_convenience.c    | 2 +-
 libsrc/hdf_convenience.h    | 2 +-
 libsrc/minc_routines.h      | 2 +-
 libsrc/netcdf_convenience.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libsrc/hdf_convenience.c b/libsrc/hdf_convenience.c
index b65695c..5f5fb2a 100644
--- a/libsrc/hdf_convenience.c
+++ b/libsrc/hdf_convenience.c
@@ -2388,7 +2388,7 @@ hdf_create(const char *path, int cmode, struct mi2opts *opts_ptr)
 }
 
 int
-hdf_close(int fd)
+hdf_fclose(int fd)
 {
     hdf_dim_commit(fd);         /* Make sure all dimensions were saved. */
     hdf_id_del(fd);		/* Delete it from the list. */
diff --git a/libsrc/hdf_convenience.h b/libsrc/hdf_convenience.h
index c3d158b..f6e471c 100644
--- a/libsrc/hdf_convenience.h
+++ b/libsrc/hdf_convenience.h
@@ -47,6 +47,6 @@ extern herr_t hdf_copy_attr(hid_t in_id, const char *attr_name, void *op_data);
 
 extern int hdf_open(const char *path, int mode);
 extern int hdf_create(const char *path, int mode, struct mi2opts *opts_ptr);
-extern int hdf_close(int fd);
+extern int hdf_fclose(int fd);
 extern int hdf_access(const char *path);
 
diff --git a/libsrc/minc_routines.h b/libsrc/minc_routines.h
index b27506a..ad47272 100644
--- a/libsrc/minc_routines.h
+++ b/libsrc/minc_routines.h
@@ -101,6 +101,6 @@ extern int hdf_var_declare(int fd, char *varnm, char *varpath, int ndims,
 
 extern int hdf_create(const char *path, int cmode, struct mi2opts *opts_ptr);
 extern int hdf_open(const char *path, int mode);
-extern int hdf_close(int fd);
+extern int hdf_fclose(int fd);
 #endif /* MINC2 */
 #endif
diff --git a/libsrc/netcdf_convenience.c b/libsrc/netcdf_convenience.c
index d9df8ba..56d7ec0 100644
--- a/libsrc/netcdf_convenience.c
+++ b/libsrc/netcdf_convenience.c
@@ -673,7 +673,7 @@ MNCAPI int miclose(int cdfid)
 
 #if MINC2
    if (MI2_ISH5OBJ(cdfid)) {
-       status = hdf_close(cdfid);
+       status = hdf_fclose(cdfid);
    }
    else {
        status = ncclose(cdfid);
-- 
2.6.2