From 9376394f08232d19fff187d1202233d265401f04 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Tue, 26 Nov 2019 11:16:30 -0500 Subject: [PATCH] Fix: lttng-ust-comm.c: return number of fd rather size of array There are two conflicting comments for this function. One says it returns the size of the received data and the other says it returns the number of fd received. It's more useful to receive the number of fd. Signed-off-by: Francis Deslauriers Signed-off-by: Mathieu Desnoyers Change-Id: I74084b461d396c3e623fa55100e6dd7e59dbea83 --- liblttng-ust-comm/lttng-ust-comm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c index 92d86d4e..4ed9cc6e 100644 --- a/liblttng-ust-comm/lttng-ust-comm.c +++ b/liblttng-ust-comm/lttng-ust-comm.c @@ -438,8 +438,6 @@ ssize_t ustcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd) /* * Recv a message accompanied by fd(s) from a unix socket. * - * Returns the size of received data, or negative error value. - * * Expect at most "nb_fd" file descriptors. Returns the number of fd * actually received in nb_fd. * Returns -EPIPE on orderly shutdown. @@ -509,7 +507,7 @@ ssize_t ustcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd) goto end; } memcpy(fds, CMSG_DATA(cmsg), sizeof_fds); - ret = sizeof_fds; + ret = nb_fd; end: return ret; } -- 2.39.5