зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
05219a1276
Коммит
4c4b7d1d3b
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче