mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify some 'fprintf(stderr); return -1;' by using 'return error()'

Browse Source 
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Sixt
2009-06-08 22:34:31 +02:00
committed by Junio C Hamano
parent 0077138cd9
commit 4e2715fb98
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
builtin-help.c
View File

@ -80,10 +80,9 @@ static int check_emacsclient_version(void)
ec_process.argv = argv_ec; ec_process.argv = argv_ec;
ec_process.err = -1; ec_process.err = -1;
ec_process.stdout_to_stderr = 1; ec_process.stdout_to_stderr = 1;
if (start_command(&ec_process)) { if (start_command(&ec_process))
fprintf(stderr, "Failed to start emacsclient.\n"); return error("Failed to start emacsclient.");
return -1;
}
strbuf_read(&buffer, ec_process.err, 20); strbuf_read(&buffer, ec_process.err, 20);
close(ec_process.err); close(ec_process.err);
@ -94,20 +93,17 @@ static int check_emacsclient_version(void)
finish_command(&ec_process); finish_command(&ec_process);
if (prefixcmp(buffer.buf, "emacsclient")) { if (prefixcmp(buffer.buf, "emacsclient")) {
fprintf(stderr, "Failed to parse emacsclient version.\n");
strbuf_release(&buffer); strbuf_release(&buffer);
return -1; return error("Failed to parse emacsclient version.");
} }
strbuf_remove(&buffer, 0, strlen("emacsclient")); strbuf_remove(&buffer, 0, strlen("emacsclient"));
version = atoi(buffer.buf); version = atoi(buffer.buf);
if (version < 22) { if (version < 22) {
fprintf(stderr,
"emacsclient version '%d' too old (< 22).\n",
version);
strbuf_release(&buffer); strbuf_release(&buffer);
return -1; return error("emacsclient version '%d' too old (< 22).",
version);
} }
strbuf_release(&buffer); strbuf_release(&buffer);