[dm-devel] [PATCH V3 2/3] multipath-tools: Set errno mpath_recv_reply() when failure.

[Gris Ge]

Enforce what mpath_cmd.h states "-1 on failure (with errno set)" for
mpath_recv_reply() by set errno and return -1 on failure.

Signed-off-by: Gris Ge <fge at redhat.com>
---
 libmpathcmd/mpath_cmd.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libmpathcmd/mpath_cmd.c b/libmpathcmd/mpath_cmd.c
index 2290ecb..309634e 100644
--- a/libmpathcmd/mpath_cmd.c
+++ b/libmpathcmd/mpath_cmd.c
@@ -141,9 +141,11 @@ int mpath_recv_reply(int fd, char **reply, unsigned int timeout)
 	*reply = NULL;
 	len = mpath_recv_reply_len(fd, timeout);
 	if (len <= 0)
-		return len;
-	if (len > MAX_REPLY_LEN)
-		return -EINVAL;
+		return -1;
+	if (len > MAX_REPLY_LEN) {
+		errno = EINVAL;
+		return -1;
+	}
 	*reply = malloc(len);
 	if (!*reply)
 		return -1;
@@ -151,7 +153,7 @@ int mpath_recv_reply(int fd, char **reply, unsigned int timeout)
 	if (err) {
 		free(*reply);
 		*reply = NULL;
-		return err;
+		return -1;
 	}
 	return 0;
 }
-- 
2.9.0