]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
perf script: Kill script_spec__delete
authorNamhyung Kim <namhyung@gmail.com>
Tue, 27 Dec 2011 15:35:51 +0000 (00:35 +0900)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 3 Jan 2012 17:06:34 +0000 (15:06 -0200)
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>
tools/perf/builtin-script.c

index 3d4c0c7b576e309272f7a7371d625b03eaeb228c..fd1909afcfd62f29757151261e65e7b8419da79e 100644 (file)
@@ -536,12 +536,6 @@ static struct script_spec *script_spec__new(const char *spec,
        return s;
 }
 
-static void script_spec__delete(struct script_spec *s)
-{
-       free(s->spec);
-       free(s);
-}
-
 static void script_spec__add(struct script_spec *s)
 {
        list_add_tail(&s->node, &script_specs);
@@ -567,16 +561,11 @@ static struct script_spec *script_spec__findnew(const char *spec,
 
        s = script_spec__new(spec, ops);
        if (!s)
-               goto out_delete_spec;
+               return NULL;
 
        script_spec__add(s);
 
        return s;
-
-out_delete_spec:
-       script_spec__delete(s);
-
-       return NULL;
 }
 
 int script_spec_register(const char *spec, struct scripting_ops *ops)