Skip to content

Commit

Permalink
run-command.c: fix build warnings on Ubuntu
Browse files Browse the repository at this point in the history
Building git on Ubuntu 9.10 warns that the return value of write(2)
isn't checked. These warnings were introduced in commits:

  2b541bf ("start_command: detect execvp failures early")
  a5487dd ("start_command: report child process setup errors to the
parent's stderr")

GCC details:

  $ gcc --version
  gcc (Ubuntu 4.4.1-4ubuntu9) 4.4.1

Silence the warnings by reading (but not making use of) the return value
of write(2).

Signed-off-by: Michael Wookey <michaelwookey@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Michael Wookey authored and Junio C Hamano committed Mar 4, 2010
1 parent e923eae commit 90ff12a
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions run-command.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit 90ff12a

Please sign in to comment.