Commit 8560bae0 authored Feb 26, 2016 by Taeung Song Committed by Arnaldo Carvalho de Melo Feb 25, 2016

perf script: Remove duplicated code and needless script_spec__findnew()



script_spec_register() called two functions: script_spec__find() and
script_spec__findnew().  But this way script_spec__find() gets called
two times, directly and via script_spec__findnew().

So remove script_spec__findnew() and make script_spec_register() only
call once script_spec__find().

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1456413190-12378-1-git-send-email-treeze.taeung@gmail.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 8579aca3

tools/perf/builtin-script.c

+3 −18

Original line number	Diff line number	Diff line
		@@ -1212,23 +1212,6 @@ static struct script_spec script_spec__find(const char spec)
		return NULL;
		}

		static struct script_spec script_spec__findnew(const char spec,
		struct scripting_ops *ops)
		{
		struct script_spec *s = script_spec__find(spec);

		if (s)
		return s;

		s = script_spec__new(spec, ops);
		if (!s)
		return NULL;

		script_spec__add(s);

		return s;
		}

		int script_spec_register(const char spec, struct scripting_ops ops)
		{
		struct script_spec *s;
		@@ -1237,9 +1220,11 @@ int script_spec_register(const char spec, struct scripting_ops ops)
		if (s)
		return -1;

		s = script_spec__findnew(spec, ops);
		s = script_spec__new(spec, ops);
		if (!s)
		return -1;
		else
		script_spec__add(s);

		return 0;
		}

Admin message