Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 10:46:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

perf help: Make check_emacsclient_version to check strbuf APIs

Browse Source 
Make check_emacsclient_version() to check the return value of strbuf
APIs so that it can handle errors in strbuf.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20160510054716.6158.11755.stgit@devbox
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Masami Hiramatsu 2016-05-10 14:47:17 +09:00 committed by Arnaldo Carvalho de Melo
parent bf4d5f25c9
commit b72ca40390
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/perf/builtin-help.c
View File

@ -61,6 +61,7 @@ static int check_emacsclient_version(void)
struct child_process ec_process; struct child_process ec_process;
const char *argv_ec[] = { "emacsclient", "--version", NULL }; const char *argv_ec[] = { "emacsclient", "--version", NULL };
int version; int version;
int ret = -1;
/* emacsclient prints its version number on stderr */ /* emacsclient prints its version number on stderr */
memset(&ec_process, 0, sizeof(ec_process)); memset(&ec_process, 0, sizeof(ec_process));
@ -71,7 +72,10 @@ static int check_emacsclient_version(void)
fprintf(stderr, "Failed to start emacsclient.\n"); fprintf(stderr, "Failed to start emacsclient.\n");
return -1; return -1;
} }
strbuf_read(&buffer, ec_process.err, 20); if (strbuf_read(&buffer, ec_process.err, 20) < 0) {
fprintf(stderr, "Failed to read emacsclient version\n");
goto out;
}
close(ec_process.err); close(ec_process.err);
/* /*
@ -82,8 +86,7 @@ static int check_emacsclient_version(void)
if (prefixcmp(buffer.buf, "emacsclient")) { if (prefixcmp(buffer.buf, "emacsclient")) {
fprintf(stderr, "Failed to parse emacsclient version.\n"); fprintf(stderr, "Failed to parse emacsclient version.\n");
strbuf_release(&buffer); goto out;
return -1;
} }
version = atoi(buffer.buf + strlen("emacsclient")); version = atoi(buffer.buf + strlen("emacsclient"));
@ -92,12 +95,11 @@ static int check_emacsclient_version(void)
fprintf(stderr, fprintf(stderr,
"emacsclient version '%d' too old (< 22).\n", "emacsclient version '%d' too old (< 22).\n",
version); version);
strbuf_release(&buffer); } else
return -1; ret = 0;
} out:
strbuf_release(&buffer); strbuf_release(&buffer);
return 0; return ret;
} }
static void exec_woman_emacs(const char *path, const char *page) static void exec_woman_emacs(const char *path, const char *page)