perf time-utils: Simplify perf_time__parse_for_ranges() error paths slightly (2a8afddc) · Commits · 戴 / test

tools/perf/util/time-utils.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -403,7 +403,7 @@ int perf_time__parse_for_ranges(const char *time_str,
		int range_size, int range_num)
		{
		struct perf_time_interval *ptime_range;
		int size, num, ret;
		int size, num, ret = -EINVAL;

		ptime_range = perf_time__range_alloc(time_str, &size);
		if (!ptime_range)
		@@ -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"
		"Please use latest perf binary to execute 'perf record'\n"
		"(if '--buildid-all' is enabled, please set '--timestamp-boundary').\n");
		ret = -EINVAL;
		goto error;
		}

		@@ -425,11 +424,8 @@ int perf_time__parse_for_ranges(const char *time_str,
		session->evlist->first_sample_time,
		session->evlist->last_sample_time);

		if (num < 0) {
		pr_err("Invalid time string\n");
		ret = -EINVAL;
		goto error;
		}
		if (num < 0)
		goto error_invalid;
		} else {
		num = 1;
		}
		@@ -439,6 +435,8 @@ int perf_time__parse_for_ranges(const char *time_str,
		*ranges = ptime_range;
		return 0;

		error_invalid:
		pr_err("Invalid time string\n");
		error:
		free(ptime_range);
		return ret;