libexport.a: Reduce code duplication in client_init()

Clean up:  Most cases in client_init() set clp->m_naddr to zero.  Move
it to the common part of the function, and simplify the logic.  This
will make adding IPv6 support here more straightforward.

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 aa28fcfb7f6074fc2ff531f76954350090da7014..e06c874bca15b5b831745df0257be3519627eda8 100644 (file)
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -137,6 +137,7 @@ client_init(nfs_client *clp, const char *hname, struct hostent *hp)
 
        clp->m_exported = 0;
        clp->m_count = 0;
 
        clp->m_exported = 0;
        clp->m_count = 0;

+       clp->m_naddr = 0;

 
        if (clp->m_type == MCL_SUBNETWORK) {
                char    *cp = strchr(clp->m_hostname, '/');
 
        if (clp->m_type == MCL_SUBNETWORK) {
                char    *cp = strchr(clp->m_hostname, '/');


@@ -160,10 +161,10 @@ client_init(nfs_client *clp, const char *hname, struct hostent *hp)
                        }
                }
                *cp = '/';
                        }
                }
                *cp = '/';

-               clp->m_naddr = 0;
-       } else if (!hp) {
-               clp->m_naddr = 0;
-       } else {
+               return;
+       }
+
+       if (hp) {

                char    **ap = hp->h_addr_list;
                int     i;
 
                char    **ap = hp->h_addr_list;
                int     i;