mount.nfs: Remove unused @salen parameter from nfs_ca_gai()

[nfs-utils.git] / utils / mount / network.c

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 5b6f4c22451b577bbbfb8a5e31ddd58ec2cf9372..11c71623aa3b1a0f4ce1030ebae0144762e0bde1 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -170,21 +170,6 @@ static const unsigned long probe_mnt3_first[] = {
        0,
 };
 
-static void nfs_set_port(struct sockaddr *sap, const unsigned short port)
-{
-       switch (sap->sa_family) {
-       case AF_INET:
-               ((struct sockaddr_in *)sap)->sin_port = htons(port);
-               break;
-       case AF_INET6:
-               ((struct sockaddr_in6 *)sap)->sin6_port = htons(port);
-               break;
-       default:
-               nfs_error(_("%s: unrecognized address family in %s"),
-                       progname, __func__);
-       }
-}
-
 static int nfs_lookup(const char *hostname, const sa_family_t family,
                      struct sockaddr *sap, socklen_t *salen)
 {
@@ -798,8 +783,8 @@ int start_statd(void)
                                execl(START_STATD, START_STATD, NULL);
                                exit(1);
                        case -1: /* error */
-                               nfs_error(_("fork failed: %s"),
-                                                       strerror(errno));
+                               nfs_error(_("%s: fork failed: %s"),
+                                               progname, strerror(errno));
                                break;
                        default: /* parent */
                                waitpid(pid, NULL,0);
@@ -1118,7 +1103,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;
@@ -1159,7 +1144,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;
 
        /*
@@ -1174,7 +1159,8 @@ int nfs_callback_address(const struct sockaddr *sap, const socklen_t salen,
 out_failed:
        *buflen = 0;
        if (verbose)
-               nfs_error(_("%s: failed to construct callback address"));
+               nfs_error(_("%s: failed to construct callback address"),
+                               progname);
        return 0;
 }