lkml.org 
[lkml]   [2016]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH perf/core v3 3/8] perf help: Make check_emacsclient_version to check strbuf APIs
Em Tue, May 10, 2016 at 02:47:17PM +0900, Masami Hiramatsu escreveu:
> Make check_emacsclient_version() to check the return
> value of strbuf APIs so that it can handle errors in
> strbuf.
> ---

You forgot to add the S-o-B, since you provided it in the previous
submission, I'm adding it now.

- Arnaldo

> tools/perf/builtin-help.c | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c
> index bc1de9b..f9830c9 100644
> --- a/tools/perf/builtin-help.c
> +++ b/tools/perf/builtin-help.c
> @@ -61,6 +61,7 @@ static int check_emacsclient_version(void)
> struct child_process ec_process;
> const char *argv_ec[] = { "emacsclient", "--version", NULL };
> int version;
> + int ret = -1;
>
> /* emacsclient prints its version number on stderr */
> memset(&ec_process, 0, sizeof(ec_process));
> @@ -71,7 +72,10 @@ static int check_emacsclient_version(void)
> fprintf(stderr, "Failed to start emacsclient.\n");
> 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);
>
> /*
> @@ -82,8 +86,7 @@ static int check_emacsclient_version(void)
>
> if (prefixcmp(buffer.buf, "emacsclient")) {
> fprintf(stderr, "Failed to parse emacsclient version.\n");
> - strbuf_release(&buffer);
> - return -1;
> + goto out;
> }
>
> version = atoi(buffer.buf + strlen("emacsclient"));
> @@ -92,12 +95,11 @@ static int check_emacsclient_version(void)
> fprintf(stderr,
> "emacsclient version '%d' too old (< 22).\n",
> version);
> - strbuf_release(&buffer);
> - return -1;
> - }
> -
> + } else
> + ret = 0;
> +out:
> strbuf_release(&buffer);
> - return 0;
> + return ret;
> }
>
> static void exec_woman_emacs(const char *path, const char *page)

\
 
 \ /
  Last update: 2016-05-10 17:21    [W:0.156 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site