mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-28 20:44:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'lf/sideband-returns-void'

Browse Source 
A small internal API cleanup.

* lf/sideband-returns-void:
  upload-pack.c: make send_client_data() return void
  sideband.c: make send_sideband() return void
This commit is contained in:
Junio C Hamano 2016-07-06 13:38:09 -07:00
commit 35d213c87c
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sideband.c
View File

@ -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 * fd is connected to the remote side; send the sideband data
* over multiplexed packet stream. * 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; const char *p = data;
while (sz) { while (sz) {
@ -148,5 +147,4 @@ ssize_t send_sideband(int fd, int band, const char *data, ssize_t sz, int packet
p += n; p += n;
sz -= n; sz -= n;
} }
return ssz;
} }

2
sideband.h
View File

@ -5,6 +5,6 @@
#define SIDEBAND_REMOTE_ERROR -1 #define SIDEBAND_REMOTE_ERROR -1
int recv_sideband(const char *me, int in_stream, int out); 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

19
upload-pack.c
View File

@ -62,20 +62,21 @@ static void reset_timeout(void)
alarm(timeout); alarm(timeout);
} }
static ssize_t send_client_data(int fd, const char *data, ssize_t sz) static void send_client_data(int fd, const char *data, ssize_t sz)
{ {
if (use_sideband) if (use_sideband) {
return send_sideband(1, fd, data, sz, use_sideband); send_sideband(1, fd, data, sz, use_sideband);
return;
}
if (fd == 3) if (fd == 3)
/* emergency quit */ /* emergency quit */
fd = 2; fd = 2;
if (fd == 2) { if (fd == 2) {
/* XXX: are we happy to lose stuff here? */ /* XXX: are we happy to lose stuff here? */
xwrite(fd, data, sz); xwrite(fd, data, sz);
return sz; return;
} }
write_or_die(fd, data, sz); write_or_die(fd, data, sz);
return sz;
} }
static int write_one_shallow(const struct commit_graft *graft, void *cb_data) static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
@ -233,9 +234,7 @@ static void create_pack_file(void)
} }
else else
buffered = -1; buffered = -1;
sz = send_client_data(1, data, sz); send_client_data(1, data, sz);
if (sz < 0)
goto fail;
} }
/* /*
@ -262,9 +261,7 @@ static void create_pack_file(void)
/* flush the data */ /* flush the data */
if (0 <= buffered) { if (0 <= buffered) {
data[0] = buffered; data[0] = buffered;
sz = send_client_data(1, data, 1); send_client_data(1, data, 1);
if (sz < 0)
goto fail;
fprintf(stderr, "flushed.\n"); fprintf(stderr, "flushed.\n");
} }
if (use_sideband) if (use_sideband)