Commit 2a8afddc authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo

perf time-utils: Simplify perf_time__parse_for_ranges() error paths slightly

Simplify perf_time__parse_for_ranges() error paths slightly.
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/20190604130017.31207-17-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 0ccc69ba
...@@ -403,7 +403,7 @@ int perf_time__parse_for_ranges(const char *time_str, ...@@ -403,7 +403,7 @@ int perf_time__parse_for_ranges(const char *time_str,
int *range_size, int *range_num) int *range_size, int *range_num)
{ {
struct perf_time_interval *ptime_range; struct perf_time_interval *ptime_range;
int size, num, ret; int size, num, ret = -EINVAL;
ptime_range = perf_time__range_alloc(time_str, &size); ptime_range = perf_time__range_alloc(time_str, &size);
if (!ptime_range) if (!ptime_range)
...@@ -415,7 +415,6 @@ int perf_time__parse_for_ranges(const char *time_str, ...@@ -415,7 +415,6 @@ int perf_time__parse_for_ranges(const char *time_str,
pr_err("HINT: no first/last sample time found in perf data.\n" pr_err("HINT: no first/last sample time found in perf data.\n"
"Please use latest perf binary to execute 'perf record'\n" "Please use latest perf binary to execute 'perf record'\n"
"(if '--buildid-all' is enabled, please set '--timestamp-boundary').\n"); "(if '--buildid-all' is enabled, please set '--timestamp-boundary').\n");
ret = -EINVAL;
goto error; goto error;
} }
...@@ -425,11 +424,8 @@ int perf_time__parse_for_ranges(const char *time_str, ...@@ -425,11 +424,8 @@ int perf_time__parse_for_ranges(const char *time_str,
session->evlist->first_sample_time, session->evlist->first_sample_time,
session->evlist->last_sample_time); session->evlist->last_sample_time);
if (num < 0) { if (num < 0)
pr_err("Invalid time string\n"); goto error_invalid;
ret = -EINVAL;
goto error;
}
} else { } else {
num = 1; num = 1;
} }
...@@ -439,6 +435,8 @@ int perf_time__parse_for_ranges(const char *time_str, ...@@ -439,6 +435,8 @@ int perf_time__parse_for_ranges(const char *time_str,
*ranges = ptime_range; *ranges = ptime_range;
return 0; return 0;
error_invalid:
pr_err("Invalid time string\n");
error: error:
free(ptime_range); free(ptime_range);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment