diff options
| author | Lukas Fleischer <lfleischer@lfos.de> | 2016-06-14 16:49:16 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-16 11:40:19 -0700 |
| commit | 4c4b7d1d3b5be12ad83d0ecfc537b40af37462c9 (patch) | |
| tree | d87a4bd2febac4d2ebf49d5bf3c275b0f6998c94 | |
| parent | 05219a1276341e72d8082d76b7f5ed394b7437a4 (diff) | |
| download | git-4c4b7d1d3b5be12ad83d0ecfc537b40af37462c9.tar.gz | |
sideband.c: make send_sideband() return void
The send_sideband() function uses write_or_die() for writing data which
immediately terminates the process on errors. If no such error occurred,
send_sideband() always returned the value that was passed as fourth
parameter prior to this commit. This value is already known to the
caller in any case, so let's turn send_sideband() into a void function
instead.
Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sideband.c | 4 | ||||
| -rw-r--r-- | sideband.h | 2 | ||||
| -rw-r--r-- | upload-pack.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sideband.c b/sideband.c index fde8adc000..c09929dafa 100644 --- a/sideband.c +++ b/sideband.c @@ -124,9 +124,8 @@ int recv_sideband(const char *me, int in_stream, int out) * fd is connected to the remote side; send the sideband data * over multiplexed packet stream. */ -ssize_t send_sideband(int fd, int band, const char *data, ssize_t sz, int packet_max) +void send_sideband(int fd, int band, const char *data, ssize_t sz, int packet_max) { - ssize_t ssz = sz; const char *p = data; while (sz) { @@ -148,5 +147,4 @@ ssize_t send_sideband(int fd, int band, const char *data, ssize_t sz, int packet p += n; sz -= n; } - return ssz; } diff --git a/sideband.h b/sideband.h index e46bed0b01..7a8146f161 100644 --- a/sideband.h +++ b/sideband.h @@ -5,6 +5,6 @@ #define SIDEBAND_REMOTE_ERROR -1 int recv_sideband(const char *me, int in_stream, int out); -ssize_t send_sideband(int fd, int band, const char *data, ssize_t sz, int packet_max); +void send_sideband(int fd, int band, const char *data, ssize_t sz, int packet_max); #endif diff --git a/upload-pack.c b/upload-pack.c index f19444df7b..f9d6410605 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -60,8 +60,10 @@ static void reset_timeout(void) static ssize_t send_client_data(int fd, const char *data, ssize_t sz) { - if (use_sideband) - return send_sideband(1, fd, data, sz, use_sideband); + if (use_sideband) { + send_sideband(1, fd, data, sz, use_sideband); + return sz; + } if (fd == 3) /* emergency quit */ fd = 2; |