From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Thu, 9 Jul 2020 20:22:19 +0000 (-0400)
Subject: Fix: send/received actual size is overwritten by 'expected' size
X-Git-Tag: v2.11.5~4
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=52cf181f441bb969ca20d8a444281d66d7e60271

Fix: send/received actual size is overwritten by 'expected' size

Observed issue
==============

None.

Cause
=====

None.

Solution
========

Return the actual send/received size. Caller code correctly handles
partial send/receive.

Known drawbacks
=========

None

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ie52c39d0ab778108e3fde1b2375c0535caec97b1
---

diff --git a/src/common/unix.c b/src/common/unix.c
index 37bb1a711..141e85233 100644
--- a/src/common/unix.c
+++ b/src/common/unix.c
@@ -263,7 +263,7 @@ retry:
 			goto end;
 		}
 	}
-	ret = len;
+
 end:
 	return ret;
 }
@@ -362,7 +362,6 @@ retry:
 			goto end;
 		}
 	}
-	ret = len;
 end:
 	return ret;
 }