From 4f83e929c09fc06da7d42faa1b8181c59ae478f1 Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Sat, 16 Jun 2018 08:38:52 -0600 Subject: [PATCH] switch to vars --- libhdf5/nc4hdf.c | 4 ++-- libsrc4/nc4var.c | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libhdf5/nc4hdf.c b/libhdf5/nc4hdf.c index 7e6a91d17..fa35b0418 100644 --- a/libhdf5/nc4hdf.c +++ b/libhdf5/nc4hdf.c @@ -4374,7 +4374,7 @@ NC4_walk(hid_t gid, int* countp) * @returns ::NC_EMPI MPI library error (parallel only) * @returns ::NC_ECANTEXTEND Can't extend dimension for write. * @returns ::NC_ERANGE Data conversion error. - * @author Ed Hartnett + * @author Ed Hartnett, Dennis Heimbigner */ int nc4_put_vars(NC *nc, int ncid, int varid, const size_t *startp, @@ -4703,7 +4703,7 @@ exit: * @returns ::NC_EMPI MPI library error (parallel only) * @returns ::NC_ECANTEXTEND Can't extend dimension for write. * @returns ::NC_ERANGE Data conversion error. - * @author Ed Hartnett + * @author Ed Hartnett, Dennis Heimbigner */ int nc4_get_vars(NC *nc, int ncid, int varid, const size_t *startp, diff --git a/libsrc4/nc4var.c b/libsrc4/nc4var.c index 6ef3f4962..ceee0f8d7 100644 --- a/libsrc4/nc4var.c +++ b/libsrc4/nc4var.c @@ -1673,7 +1673,8 @@ NC4_put_vara(int ncid, int varid, const size_t *startp, if (!(nc = nc4_find_nc_file(ncid, NULL))) return NC_EBADID; - return nc4_put_vara(nc, ncid, varid, startp, countp, memtype, 0, (void *)op); + return nc4_put_vars(nc, ncid, varid, startp, countp, NULL, memtype, + (void *)op); } /** @@ -1705,8 +1706,8 @@ NC4_get_vara(int ncid, int varid, const size_t *startp, return NC_EBADID; /* Get the data. */ - return nc4_get_vara(nc, ncid, varid, startp, countp, memtype, - 0, (void *)ip); + return nc4_get_vars(nc, ncid, varid, startp, countp, NULL, memtype, + (void *)ip); } /**