Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8560bae0 authored by Taeung Song's avatar Taeung Song Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarTaeung Song <treeze.taeung@gmail.com>
Acked-by: default avatarJiri 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8579aca3

tools/perf/builtin-script.c

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

	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)

int script_spec_register(const char *spec, struct scripting_ops *ops)

{

{

	struct script_spec *s;

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

	if (s)

		return -1;

		return -1;





	s = script_spec__findnew(spec, ops);

	s = script_spec__new(spec, ops);

	if (!s)

	if (!s)

		return -1;

		return -1;

	else

		script_spec__add(s);





	return 0;

	return 0;

}

}