libexport.a: Clean up client_add()

Clean up: client_add()'s current callers never set unknown m_type
values, so the m_type check is unnecessary.

All of client_add()'s callers are in the same source file where it is
defined, so make it a static helper function.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/support/export/client.c b/support/export/client.c
index 9259180dd1d618f4a36196becade0751769df821..46002558afc9d745a42258e12e7f2f1410676cd8 100644 (file)
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -113,6 +113,18 @@ client_init(nfs_client *clp, const char *hname, const struct hostent *hp)
        return 1;
 }
 
+static void
+client_add(nfs_client *clp)
+{
+       nfs_client **cpp;
+
+       cpp = &clientlist[clp->m_type];
+       while (*cpp != NULL)
+               cpp = &((*cpp)->m_next);
+       clp->m_next = NULL;
+       *cpp = clp;
+}
+
 /* if canonical is set, then we *know* this is already a canonical name
  * so hostname lookup is avoided.
  * This is used when reading /proc/fs/nfs/exports
@@ -208,20 +220,6 @@ client_dup(nfs_client *clp, struct hostent *hp)
        return new;
 }
 
-void
-client_add(nfs_client *clp)
-{
-       nfs_client      **cpp;
-
-       if (clp->m_type < 0 || clp->m_type >= MCL_MAXTYPES)
-               xlog(L_FATAL, "unknown client type in client_add");
-       cpp = clientlist + clp->m_type;
-       while (*cpp)
-               cpp = &((*cpp)->m_next);
-       clp->m_next = NULL;
-       *cpp = clp;
-}
-
 void
 client_release(nfs_client *clp)
 {

diff --git a/support/include/exportfs.h b/support/include/exportfs.h
index 9a19cbb68b7c13afeacfdd64b642d4506d8a5ccb..05891c55a3f82670dc5f2079c29a6ecbc5960957 100644 (file)
--- a/support/include/exportfs.h
+++ b/support/include/exportfs.h
@@ -69,7 +69,6 @@ extern exp_hash_table exportlist[MCL_MAXTYPES];
 extern nfs_client *            clientlist[MCL_MAXTYPES];
 
 nfs_client *                   client_lookup(char *hname, int canonical);
-void                           client_add(nfs_client *);
 nfs_client *                   client_dup(nfs_client *, struct hostent *);
 int                            client_gettype(char *hname);
 int                            client_check(nfs_client *, struct hostent *);