mount.nfs: remove unused @addrlen argument from nfs_string_to_sockaddr()

Address compiler warning:

    network.c: In function nfs_string_to_sockaddr:
    network.c:272: warning: unused parameter addrlen

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

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 11c71623aa3b1a0f4ce1030ebae0144762e0bde1..4ec7c7bc09be37291aafc4f509fc74c0465ac584 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -255,7 +255,6 @@ int nfs_gethostbyname(const char *hostname, struct sockaddr_in *sin)
 /**
  * nfs_string_to_sockaddr - convert string address to sockaddr
  * @address:   pointer to presentation format address to convert
- * @addrlen:   length of presentation address
  * @sap:       pointer to socket address buffer to fill in
  * @salen:     IN: length of address buffer
  *             OUT: length of converted socket address
@@ -269,8 +268,8 @@ int nfs_gethostbyname(const char *hostname, struct sockaddr_in *sin)
  * See RFC 4038 section 5.1 or RFC 3513 section 2.2 for more details
  * on presenting IPv6 addresses as text strings.
  */
-int nfs_string_to_sockaddr(const char *address, const size_t addrlen,
-                          struct sockaddr *sap, socklen_t *salen)
+int nfs_string_to_sockaddr(const char *address, struct sockaddr *sap,
+                          socklen_t *salen)
 {
        struct addrinfo *gai_results;
        struct addrinfo gai_hint = {

diff --git a/utils/mount/network.h b/utils/mount/network.h
index ca5fa3ba15dd78c7a9ee560b0379835dfe5432b7..db5134c2fcc8edb1e5bde5f7226766df353b1082 100644 (file)
--- a/utils/mount/network.h
+++ b/utils/mount/network.h
@@ -45,8 +45,7 @@ int nfs_probe_bothports(const struct sockaddr *, const socklen_t,
                        const socklen_t, struct pmap *);
 int nfs_gethostbyname(const char *, struct sockaddr_in *);
 int nfs_name_to_address(const char *, struct sockaddr *, socklen_t *);
-int nfs_string_to_sockaddr(const char *, const size_t,
-                          struct sockaddr *, socklen_t *);
+int nfs_string_to_sockaddr(const char *, struct sockaddr *, socklen_t *);
 int nfs_present_sockaddr(const struct sockaddr *,
                         const socklen_t, char *, const size_t);
 int nfs_callback_address(const struct sockaddr *, const socklen_t,

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 8d168db23b9ce7497a0f470a41d8e035baa79c4c..e277b3d22ac791186c84f6cba11efa80ccae0cde 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -312,16 +312,14 @@ static int nfs_extract_server_addresses(struct mount_options *options,
        option = po_get(options, "addr");
        if (option == NULL)
                return 0;
-       if (!nfs_string_to_sockaddr(option, strlen(option),
-                                               nfs_saddr, nfs_salen))
+       if (!nfs_string_to_sockaddr(option, nfs_saddr, nfs_salen))
                return 0;
 
        option = po_get(options, "mountaddr");
        if (option == NULL) {
                memcpy(mnt_saddr, nfs_saddr, *nfs_salen);
                *mnt_salen = *nfs_salen;
-       } else if (!nfs_string_to_sockaddr(option, strlen(option),
-                                               mnt_saddr, mnt_salen))
+       } else if (!nfs_string_to_sockaddr(option, mnt_saddr, mnt_salen))
                return 0;
 
        return 1;