summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-03-07 12:47:18 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-07 12:47:18 -0800
commitb7e7f6fb0005f861ca8aed80473a9809d646c403 (patch)
tree43e9ff40113dea5e9012343e3fd50d0372521984
parentMerge branch 'as/maint-expire' (diff)
parentrun-command.c: fix build warnings on Ubuntu (diff)
downloadtgif-b7e7f6fb0005f861ca8aed80473a9809d646c403.tar.xz
Merge branch 'mw/maint-gcc-warns-unused-write'
* mw/maint-gcc-warns-unused-write: run-command.c: fix build warnings on Ubuntu
-rw-r--r--run-command.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/run-command.c b/run-command.c
index 0cd7f02ffe..c8d53795ec 100644
--- a/run-command.c
+++ b/run-command.c
@@ -67,19 +67,21 @@ static int child_notifier = -1;
static void notify_parent(void)
{
- write(child_notifier, "", 1);
+ ssize_t unused;
+ unused = write(child_notifier, "", 1);
}
static NORETURN void die_child(const char *err, va_list params)
{
char msg[4096];
+ ssize_t unused;
int len = vsnprintf(msg, sizeof(msg), err, params);
if (len > sizeof(msg))
len = sizeof(msg);
- write(child_err, "fatal: ", 7);
- write(child_err, msg, len);
- write(child_err, "\n", 1);
+ unused = write(child_err, "fatal: ", 7);
+ unused = write(child_err, msg, len);
+ unused = write(child_err, "\n", 1);
exit(128);
}