summaryrefslogtreecommitdiff
path: root/sideband.h
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2006-10-11 15:49:15 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-11 18:13:01 (GMT)
commit9ac13ec941933c32849c2284b5d79ef608023a56 (patch)
tree618d32a6ba80037f6597f1ad88d9b6405701cd5f /sideband.h
parent0503f9c178c36a19e1f8e8930b367db0f58ce5ca (diff)
downloadgit-9ac13ec941933c32849c2284b5d79ef608023a56.zip
git-9ac13ec941933c32849c2284b5d79ef608023a56.tar.gz
git-9ac13ec941933c32849c2284b5d79ef608023a56.tar.bz2
atomic write for sideband remote messages
It has been a few times that I ended up with such a confusing display: |remote: Generating pack... |remote: Done counting 17 objects. |remote: Result has 9 objects. |remote: Deltifying 9 objects. |remote: 100% (9/9) done |remote: Unpacking 9 objects |Total 9, written 9 (delta 8), reused 0 (delta 0) | 100% (9/9) done The confusion can be avoided in most cases by writing the remote message in one go to prevent interleacing with local messages. The buffer declaration has been moved inside recv_sideband() to avoid extra string copies. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
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 4872106..a84b691 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, char *, int);
+int recv_sideband(const char *me, int in_stream, int out, int err);
ssize_t send_sideband(int fd, int band, const char *data, ssize_t sz, int packet_max);
#endif