GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-27 00:51:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf tools: No need to test against NULL before calling free()

Browse source 
Its perfectly fine to call free(NULL), so no need to clutter the source
code with all those superfluous testing.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-uux5wpvevlerd42gqer13e7n@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2013-12-26 15:54:57 -03:00
parent 6dd601354f
commit f5385650c0
7 changed files with 31 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/perf/builtin-kvm.c
View file

@ -1158,9 +1158,7 @@ out:
if (kvm->timerfd >= 0) if (kvm->timerfd >= 0)
close(kvm->timerfd); close(kvm->timerfd);
if (pollfds)
free(pollfds); free(pollfds);
return err; return err;
} }

1
tools/perf/ui/browsers/scripts.c
View file

@ -173,7 +173,6 @@ int script_browse(const char *script_opt)
if (script.b.width > AVERAGE_LINE_LEN) if (script.b.width > AVERAGE_LINE_LEN)
script.b.width = AVERAGE_LINE_LEN; script.b.width = AVERAGE_LINE_LEN;
if (line)
free(line); free(line);
pclose(fp); pclose(fp);

2
tools/perf/util/header.c
View file

@ -1232,9 +1232,7 @@ static void free_event_desc(struct perf_evsel *events)
return; return;
for (evsel = events; evsel->attr.size; evsel++) { for (evsel = events; evsel->attr.size; evsel++) {
if (evsel->name)
free(evsel->name); free(evsel->name);
if (evsel->id)
free(evsel->id); free(evsel->id);
} }

22
tools/perf/util/probe-event.c
View file

@ -401,9 +401,7 @@ static int add_module_to_probe_trace_events(struct probe_trace_event *tevs,
} }
} }
if (tmp)
free(tmp); free(tmp);
return ret; return ret;
} }
@ -1382,7 +1380,6 @@ static char *synthesize_perf_probe_point(struct perf_probe_point *pp)
error: error:
pr_debug("Failed to synthesize perf probe point: %s\n", pr_debug("Failed to synthesize perf probe point: %s\n",
strerror(-ret)); strerror(-ret));
if (buf)
free(buf); free(buf);
return NULL; return NULL;
} }
@ -1584,33 +1581,24 @@ void clear_perf_probe_event(struct perf_probe_event *pev)
struct perf_probe_arg_field *field, *next; struct perf_probe_arg_field *field, *next;
int i; int i;
if (pev->event)
free(pev->event); free(pev->event);
if (pev->group)
free(pev->group); free(pev->group);
if (pp->file)
free(pp->file); free(pp->file);
if (pp->function)
free(pp->function); free(pp->function);
if (pp->lazy_line)
free(pp->lazy_line); free(pp->lazy_line);
for (i = 0; i < pev->nargs; i++) { for (i = 0; i < pev->nargs; i++) {
if (pev->args[i].name)
free(pev->args[i].name); free(pev->args[i].name);
if (pev->args[i].var)
free(pev->args[i].var); free(pev->args[i].var);
if (pev->args[i].type)
free(pev->args[i].type); free(pev->args[i].type);
field = pev->args[i].field; field = pev->args[i].field;
while (field) { while (field) {
next = field->next; next = field->next;
if (field->name)
free(field->name); free(field->name);
free(field); free(field);
field = next; field = next;
} }
} }
if (pev->args)
free(pev->args); free(pev->args);
memset(pev, 0, sizeof(*pev)); memset(pev, 0, sizeof(*pev));
} }
@ -1620,20 +1608,13 @@ static void clear_probe_trace_event(struct probe_trace_event *tev)
struct probe_trace_arg_ref *ref, *next; struct probe_trace_arg_ref *ref, *next;
int i; int i;
if (tev->event)
free(tev->event); free(tev->event);
if (tev->group)
free(tev->group); free(tev->group);
if (tev->point.symbol)
free(tev->point.symbol); free(tev->point.symbol);
if (tev->point.module)
free(tev->point.module); free(tev->point.module);
for (i = 0; i < tev->nargs; i++) { for (i = 0; i < tev->nargs; i++) {
if (tev->args[i].name)
free(tev->args[i].name); free(tev->args[i].name);
if (tev->args[i].value)
free(tev->args[i].value); free(tev->args[i].value);
if (tev->args[i].type)
free(tev->args[i].type); free(tev->args[i].type);
ref = tev->args[i].ref; ref = tev->args[i].ref;
while (ref) { while (ref) {
@ -1642,7 +1623,6 @@ static void clear_probe_trace_event(struct probe_trace_event *tev)
ref = next; ref = next;
} }
} }
if (tev->args)
free(tev->args); free(tev->args);
memset(tev, 0, sizeof(*tev)); memset(tev, 0, sizeof(*tev));
} }

4
tools/perf/util/probe-finder.c
View file

@ -1414,9 +1414,7 @@ int debuginfo__find_available_vars_at(struct debuginfo *dbg,
if (ret < 0) { if (ret < 0) {
/* Free vlist for error */ /* Free vlist for error */
while (af.nvls--) { while (af.nvls--) {
if (af.vls[af.nvls].point.symbol)
free(af.vls[af.nvls].point.symbol); free(af.vls[af.nvls].point.symbol);
if (af.vls[af.nvls].vars)
strlist__delete(af.vls[af.nvls].vars); strlist__delete(af.vls[af.nvls].vars);
} }
free(af.vls); free(af.vls);
@ -1524,10 +1522,8 @@ post:
if (fname) { if (fname) {
ppt->file = strdup(fname); ppt->file = strdup(fname);
if (ppt->file == NULL) { if (ppt->file == NULL) {
if (ppt->function) {
free(ppt->function); free(ppt->function);
ppt->function = NULL; ppt->function = NULL;
}
ret = -ENOMEM; ret = -ENOMEM;
goto end; goto end;
} }

1
tools/perf/util/scripting-engines/trace-event-perl.c
View file

@ -194,7 +194,6 @@ static void define_event_symbols(struct event_format *event,
zero_flag_atom = 0; zero_flag_atom = 0;
break; break;
case PRINT_FIELD: case PRINT_FIELD:
if (cur_field_name)
free(cur_field_name); free(cur_field_name);
cur_field_name = strdup(args->field.name); cur_field_name = strdup(args->field.name);
break; break;

1
tools/perf/util/scripting-engines/trace-event-python.c
View file

@ -161,7 +161,6 @@ static void define_event_symbols(struct event_format *event,
zero_flag_atom = 0; zero_flag_atom = 0;
break; break;
case PRINT_FIELD: case PRINT_FIELD:
if (cur_field_name)
free(cur_field_name); free(cur_field_name);
cur_field_name = strdup(args->field.name); cur_field_name = strdup(args->field.name);
break; break;