X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fmount%2Fnetwork.c;h=4ec7c7bc09be37291aafc4f509fc74c0465ac584;hb=b46dc42505da799a05a3a5e8f004b308f6b9eef7;hp=6e0a72a3960f2bb8053a60a3892ccedb1b963cda;hpb=1767d5f5c9c26aa33b602a33ece83c2bfe55259f;p=nfs-utils.git diff --git a/utils/mount/network.c b/utils/mount/network.c index 6e0a72a..4ec7c7b 100644 --- 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 = { @@ -1103,7 +1102,7 @@ static int nfs_ca_sockname(const struct sockaddr *sap, const socklen_t salen, * * Returns 1 and fills in @buf if successful; otherwise, zero. */ -static int nfs_ca_gai(const struct sockaddr *sap, const socklen_t salen, +static int nfs_ca_gai(const struct sockaddr *sap, struct sockaddr *buf, socklen_t *buflen) { struct addrinfo *gai_results; @@ -1144,7 +1143,7 @@ int nfs_callback_address(const struct sockaddr *sap, const socklen_t salen, struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)buf; if (nfs_ca_sockname(sap, salen, buf, buflen) == 0) - if (nfs_ca_gai(sap, salen, buf, buflen) == 0) + if (nfs_ca_gai(sap, buf, buflen) == 0) goto out_failed; /*