[PATCH -tip:perf/core 4/4] perf script: Kill script_spec__delete

From: Namhyung Kim
Date: Tue Dec 27 2011 - 10:36:35 EST


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.

Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
---
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 ea71c5e1a94f..d9c049e98a58 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,
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)
--
1.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/