From 6ff1fd42db18c657fbc5f81169a566b41d53e731 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Wed, 5 May 2010 14:42:01 -0400 Subject: [PATCH] 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 Signed-off-by: Steve Dickson --- support/export/client.c | 26 ++++++++++++-------------- support/include/exportfs.h | 1 - 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/support/export/client.c b/support/export/client.c index 9259180..4600255 100644 --- 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 9a19cbb..05891c5 100644 --- 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 *); -- 2.39.5