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>

diff --git a/sideband.c b/sideband.c
index fde8adc000f3167bba7fdf2d7cb3a4e7db612af4..c09929dafa5843698b0c5c6cb36e70da03ca63a5 100644 (file)
--- 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.
  */
  * 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) {
        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;
        }
                p += n;
                sz -= n;
        }

-       return ssz;

 }
 }

diff --git a/sideband.h b/sideband.h
index e46bed0b0158c0253bacb2a3db028770ad221666..7a8146f161b7b460d29baea82230c0b6c11c5322 100644 (file)
--- 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);
 #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
 
 #endif

diff --git a/upload-pack.c b/upload-pack.c
index f19444df7bc9c19da4d2f3bf831525f7a5d6034d..f9d6410605fa9fe516a7559bf8415c55f0ebd4fb 100644 (file)
--- 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)
 {
 
 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;
        if (fd == 3)
                /* emergency quit */
                fd = 2;