_gnutls_buffer_append_data_prefix: cleanup

This eliminates a misleading code that assumed that the called functions
will return the appended size. Always return zero on success which is
what the existing callers assume.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/lib/str.c b/lib/str.c
index 373cfce1b9..e10ecd4802 100644
--- a/lib/str.c
+++ b/lib/str.c
@@ -831,20 +831,19 @@ _gnutls_buffer_append_data_prefix(gnutls_buffer_st * buf,
 				  int pfx_size, const void *data,
 				  size_t data_size)
 {
-	int ret = 0, ret1;
+	int ret;
 
-	ret1 = _gnutls_buffer_append_prefix(buf, pfx_size, data_size);
-	if (ret1 < 0)
-		return gnutls_assert_val(ret1);
+	ret = _gnutls_buffer_append_prefix(buf, pfx_size, data_size);
+	if (ret < 0)
+		return gnutls_assert_val(ret);
 
 	if (data_size > 0) {
 		ret = _gnutls_buffer_append_data(buf, data, data_size);
-
 		if (ret < 0)
 			return gnutls_assert_val(ret);
 	}
 
-	return ret + ret1;
+	return 0;
 }
 
 int _gnutls_buffer_append_mpi(gnutls_buffer_st * buf, int pfx_size,