diff options
author | Namhyung Kim <namhyung@gmail.com> | 2011-12-27 10:35:51 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-01-03 12:06:34 -0500 |
commit | 466e2876bcb9ddc9b92502c46689679bee7d72a0 (patch) | |
tree | 169737d7f58146fb69f3c3215bcd3df73dec051a /tools | |
parent | 057a174a064f68bac042d618ce3c6ea3ccd9a8aa (diff) |
perf script: Kill script_spec__delete
As script_spec__delete() frees given struct script_spec it should not be
called if we failed to allocate the struct. Also it's the only caller of
the function, we can get rid of the function itself.
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1325000151-4463-4-git-send-email-namhyung@gmail.com
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/builtin-script.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 3d4c0c7b576e..fd1909afcfd6 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c | |||
@@ -536,12 +536,6 @@ static struct script_spec *script_spec__new(const char *spec, | |||
536 | return s; | 536 | return s; |
537 | } | 537 | } |
538 | 538 | ||
539 | static void script_spec__delete(struct script_spec *s) | ||
540 | { | ||
541 | free(s->spec); | ||
542 | free(s); | ||
543 | } | ||
544 | |||
545 | static void script_spec__add(struct script_spec *s) | 539 | static void script_spec__add(struct script_spec *s) |
546 | { | 540 | { |
547 | list_add_tail(&s->node, &script_specs); | 541 | list_add_tail(&s->node, &script_specs); |
@@ -567,16 +561,11 @@ static struct script_spec *script_spec__findnew(const char *spec, | |||
567 | 561 | ||
568 | s = script_spec__new(spec, ops); | 562 | s = script_spec__new(spec, ops); |
569 | if (!s) | 563 | if (!s) |
570 | goto out_delete_spec; | 564 | return NULL; |
571 | 565 | ||
572 | script_spec__add(s); | 566 | script_spec__add(s); |
573 | 567 | ||
574 | return s; | 568 | return s; |
575 | |||
576 | out_delete_spec: | ||
577 | script_spec__delete(s); | ||
578 | |||
579 | return NULL; | ||
580 | } | 569 | } |
581 | 570 | ||
582 | int script_spec_register(const char *spec, struct scripting_ops *ops) | 571 | int script_spec_register(const char *spec, struct scripting_ops *ops) |