mount.nfs: Fix compiler warning in stropts.c

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

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 8d168db23b9ce7497a0f470a41d8e035baa79c4c..9d82bb141d37fbea3052c5ee02b0c5eb9cc6d75f 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -130,12 +130,14 @@ static int nfs_append_generic_address_option(const struct sockaddr *sap,
 {
        char address[NI_MAXHOST];
        char new_option[512];
+       int len;
 
        if (!nfs_present_sockaddr(sap, salen, address, sizeof(address)))
                goto out_err;
 
-       if (snprintf(new_option, sizeof(new_option), "%s=%s",
-                                       keyword, address) >= sizeof(new_option))
+       len = snprintf(new_option, sizeof(new_option), "%s=%s",
+                                               keyword, address);
+       if (len < 0 || (size_t)len >= sizeof(new_option))
                goto out_err;
 
        if (po_append(options, new_option) != PO_SUCCEEDED)
@@ -312,16 +314,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;