path: root/send-pack.c
diff options
authorAndy Whitcroft <>2007-01-08 15:57:52 (GMT)
committerJunio C Hamano <>2007-01-08 23:44:47 (GMT)
commite08140568a131bcd26e64a0bc8188040847be998 (patch)
treed13dd8c34ea690726c0e45a63323d26a5d573c96 /send-pack.c
parent0f018baba654347b5ce746253b99d59707f80184 (diff)
short i/o: clean up the naming for the write_{in,or}_xxx family
We recently introduced a write_in_full() which would either write the specified object or emit an error message and fail. In order to fix the read side we now want to introduce a read_in_full() but without an error emit. This patch cleans up the naming of this family of calls: 1) convert the existing write_or_whine() to write_or_whine_pipe() to better indicate its pipe specific nature, 2) convert the existing write_in_full() calls to write_or_whine() to better indicate its nature, 3) introduce a write_in_full() providing a write or fail semantic, and 4) convert write_or_whine() and write_or_whine_pipe() to use write_in_full(). Signed-off-by: Andy Whitcroft <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'send-pack.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/send-pack.c b/send-pack.c
index c195d08..6756264 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -65,14 +65,14 @@ static int pack_objects(int fd, struct ref *refs)
memcpy(buf + 1, sha1_to_hex(refs->old_sha1), 40);
buf[0] = '^';
buf[41] = '\n';
- if (!write_in_full(pipe_fd[1], buf, 42,
+ if (!write_or_whine(pipe_fd[1], buf, 42,
"send-pack: send refs"))
if (!is_null_sha1(refs->new_sha1)) {
memcpy(buf, sha1_to_hex(refs->new_sha1), 40);
buf[40] = '\n';
- if (!write_in_full(pipe_fd[1], buf, 41,
+ if (!write_or_whine(pipe_fd[1], buf, 41,
"send-pack: send refs"))