summaryrefslogtreecommitdiff
path: root/sideband.h
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2009-03-10 21:54:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-11 06:23:02 (GMT)
commit34df8abaf358c83cc1447d0a81bda7848685a1c9 (patch)
treea886a53059e8fbad18429de73c620c4af306d301 /sideband.h
parentc4994ce953b4f0fdbf80004da24ef845907d7dd8 (diff)
downloadgit-34df8abaf358c83cc1447d0a81bda7848685a1c9.zip
git-34df8abaf358c83cc1447d0a81bda7848685a1c9.tar.gz
git-34df8abaf358c83cc1447d0a81bda7848685a1c9.tar.bz2
recv_sideband: Bands #2 and #3 always go to stderr
This removes the last parameter of recv_sideband, by which the callers told which channel bands #2 and #3 should be written to. Sayeth Shawn Pearce: The definition of the streams in the current sideband protocol are rather well defined for the one protocol that uses it, fetch-pack/receive-pack: stream #1: pack data stream #2: stderr messages, progress, meant for tty stream #3: abort message, remote is dead, goodbye! Since both callers of the function passed 2 for the parameter, we hereby remove it and send bands #2 and #3 to stderr explicitly using fprintf. This has the nice side-effect that these two streams pass through our ANSI emulation layer on Windows. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sideband.h')
-rw-r--r--sideband.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sideband.h b/sideband.h
index a84b691..d72db35 100644
--- a/sideband.h
+++ b/sideband.h
@@ -7,7 +7,7 @@
#define DEFAULT_PACKET_MAX 1000
#define LARGE_PACKET_MAX 65520
-int recv_sideband(const char *me, int in_stream, int out, int err);
+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);
#endif