libexport.a: Add helper for populating m_addrlist[]

Clean up: Move common code that populates an nfs_client record's
m_addrlist to a helper function.  This eliminates a little code
duplication, and makes it simpler to add IPv6 support later.

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 e06c874bca15b5b831745df0257be3519627eda8..6a2592808f0a7e7c7b02aef0f394de1a46b474fa 100644 (file)
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -36,6 +36,22 @@ static void  client_init(nfs_client *clp, const char *hname,
 nfs_client     *clientlist[MCL_MAXTYPES] = { NULL, };
 
 
+static void
+init_addrlist(nfs_client *clp, const struct hostent *hp)
+{
+       char **ap;
+       int i;
+
+       if (hp == NULL)
+               return;
+
+       ap = hp->h_addr_list;
+       for (i = 0; *ap != NULL && i < NFSCLNT_ADDRMAX; i++, ap++)
+               clp->m_addrlist[i] = *(struct in_addr *)*ap;
+
+       clp->m_naddr = i;
+}
+
 /* 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
@@ -96,14 +112,8 @@ client_lookup(char *hname, int canonical)
                client_add(clp);
        }
 
-       if (htype == MCL_FQDN && clp->m_naddr == 0 && hp != NULL) {
-               char    **ap = hp->h_addr_list;
-               int     i;
-
-               for (i = 0; *ap && i < NFSCLNT_ADDRMAX; i++, ap++)
-                       clp->m_addrlist[i] = *(struct in_addr *)*ap;
-               clp->m_naddr = i;
-       }
+       if (htype == MCL_FQDN && clp->m_naddr == 0)
+               init_addrlist(clp, hp);
 
        if (hp)
                free (hp);
@@ -163,16 +173,8 @@ client_init(nfs_client *clp, const char *hname, struct hostent *hp)
                *cp = '/';
                return;
        }
-
-       if (hp) {
-               char    **ap = hp->h_addr_list;
-               int     i;
-
-               for (i = 0; *ap && i < NFSCLNT_ADDRMAX; i++, ap++) {
-                       clp->m_addrlist[i] = *(struct in_addr *)*ap;
-               }
-               clp->m_naddr = i;
-       }
+       
+       init_addrlist(clp, hp);
 }
 
 void