ctdb-protocol: Update error check for new string conversion wrapper

The new string conversion wrappers detect and flag errors
which occured during the string to integer conversion.
Those modifications required an update of the callees
error checks.

Signed-off-by: Swen Schillig <swen@linux.ibm.com>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>

diff --git a/ctdb/protocol/protocol_util.c b/ctdb/protocol/protocol_util.c
index f97c64665dff4a7fe054ae3842bb50cfa53a8ee7..d120213b70a90a1effb65963ebe64c1aa4e018de 100644 (file)
--- a/ctdb/protocol/protocol_util.c
+++ b/ctdb/protocol/protocol_util.c
@@ -291,7 +291,7 @@ int ctdb_sock_addr_from_string(const char *str,
        }
 
        port = strtoul_err(p+1, &endp, 10, &ret);
-       if (endp == p+1 || *endp != '\0' || ret != 0) {
+       if (ret != 0 || *endp != '\0') {
                /* Empty string or trailing garbage */
                return EINVAL;
        }
@@ -330,7 +330,7 @@ int ctdb_sock_addr_mask_from_string(const char *str,
        }
 
        m = strtoul_err(p+1, &endp, 10, &ret);
-       if (endp == p+1 || *endp != '\0' || ret != 0) {
+       if (ret != 0 || *endp != '\0') {
                /* Empty string or trailing garbage */
                return EINVAL;
        }