From 42b9dc778f639217f416627eced8ac624c92c8be Mon Sep 17 00:00:00 2001
From: Ed Hartnett <edwardjameshartnett@gmail.com>
Date: Tue, 21 Aug 2018 10:28:44 -0600
Subject: [PATCH] removing unneeded function nc4_rec_find_grp

---
 libhdf5/hdf5file.c    | 8 --------
 libsrc4/nc4internal.c | 8 ++++++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/libhdf5/hdf5file.c b/libhdf5/hdf5file.c
index b17b9ff73..ea65f77f0 100644
--- a/libhdf5/hdf5file.c
+++ b/libhdf5/hdf5file.c
@@ -469,7 +469,6 @@ NC4_redef(int ncid)
 static int
 NC4_enddef(int ncid)
 {
-   NC *nc;
    NC_FILE_INFO_T *nc4_info;
    NC_GRP_INFO_T *grp;
    NC_VAR_INFO_T *var;
@@ -481,13 +480,6 @@ NC4_enddef(int ncid)
    /* Find pointer to group and nc4_info. */
    if ((retval = nc4_find_nc_grp_h5(ncid, NULL, &grp, &nc4_info)))
       return retval;
-   /* if (!(nc = nc4_find_nc_file(ncid, &nc4_info))) */
-   /*    return NC_EBADID; */
-   /* assert(nc4_info); */
-
-   /* /\* Find info for this file and group *\/ */
-   /* if (!(grp = nc4_rec_find_grp(nc4_info, (ncid & GRP_ID_MASK)))) */
-   /*    return NC_EBADGRPID; */
 
    /* When exiting define mode, mark all variable written. */
    for (i = 0; i < ncindexsize(grp->vars); i++)
diff --git a/libsrc4/nc4internal.c b/libsrc4/nc4internal.c
index 8d2f384a8..bdc6192e2 100644
--- a/libsrc4/nc4internal.c
+++ b/libsrc4/nc4internal.c
@@ -154,8 +154,10 @@ nc4_find_nc4_grp(int ncid, NC_GRP_INFO_T **grp)
    if (h5->cmode & NC_CLASSIC_MODEL) return NC_ESTRICTNC3;
 
    /* If we can't find it, the grp id part of ncid is bad. */
-   if (!(*grp = nc4_rec_find_grp(h5, (ncid & GRP_ID_MASK))))
+   if (!(*grp = nclistget(h5->allgroups, (ncid & GRP_ID_MASK))))
       return NC_EBADID;
+   /* if (!(*grp = nc4_rec_find_grp(h5, (ncid & GRP_ID_MASK)))) */
+   /*    return NC_EBADID; */
    return NC_NOERR;
 }
 
@@ -182,8 +184,10 @@ nc4_find_grp_h5(int ncid, NC_GRP_INFO_T **grpp, NC_FILE_INFO_T **h5p)
    if (h5) {
       assert(h5->root_grp);
       /* If we can't find it, the grp id part of ncid is bad. */
-      if (!(grp = nc4_rec_find_grp(h5, (ncid & GRP_ID_MASK))))
+      if (!(grp = nclistget(h5->allgroups, (ncid & GRP_ID_MASK))))
          return NC_EBADID;
+      /* if (!(grp = nc4_rec_find_grp(h5, (ncid & GRP_ID_MASK)))) */
+      /*    return NC_EBADID; */
       h5 = (grp)->nc4_info;
       assert(h5);
    } else {