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>
if (kvm->timerfd >= 0)
close(kvm->timerfd);
if (kvm->timerfd >= 0)
close(kvm->timerfd);
- if (pollfds)
- free(pollfds);
-
if (script.b.width > AVERAGE_LINE_LEN)
script.b.width = AVERAGE_LINE_LEN;
if (script.b.width > AVERAGE_LINE_LEN)
script.b.width = AVERAGE_LINE_LEN;
- if (line)
- free(line);
pclose(fp);
script.nr_lines = nr_entries;
pclose(fp);
script.nr_lines = nr_entries;
return;
for (evsel = events; evsel->attr.size; evsel++) {
return;
for (evsel = events; evsel->attr.size; evsel++) {
- if (evsel->name)
- free(evsel->name);
- if (evsel->id)
- free(evsel->id);
+ free(evsel->name);
+ free(evsel->id);
- if (tmp)
- free(tmp);
-
error:
pr_debug("Failed to synthesize perf probe point: %s\n",
strerror(-ret));
error:
pr_debug("Failed to synthesize perf probe point: %s\n",
strerror(-ret));
struct perf_probe_arg_field *field, *next;
int i;
struct perf_probe_arg_field *field, *next;
int i;
- if (pev->event)
- free(pev->event);
- if (pev->group)
- free(pev->group);
- if (pp->file)
- free(pp->file);
- if (pp->function)
- free(pp->function);
- if (pp->lazy_line)
- free(pp->lazy_line);
+ free(pev->event);
+ free(pev->group);
+ free(pp->file);
+ free(pp->function);
+ 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);
- if (pev->args[i].var)
- free(pev->args[i].var);
- if (pev->args[i].type)
- free(pev->args[i].type);
+ free(pev->args[i].name);
+ free(pev->args[i].var);
+ free(pev->args[i].type);
field = pev->args[i].field;
while (field) {
next = field->next;
field = pev->args[i].field;
while (field) {
next = field->next;
- if (field->name)
- free(field->name);
free(field);
field = next;
}
}
free(field);
field = next;
}
}
- if (pev->args)
- free(pev->args);
memset(pev, 0, sizeof(*pev));
}
memset(pev, 0, sizeof(*pev));
}
struct probe_trace_arg_ref *ref, *next;
int i;
struct probe_trace_arg_ref *ref, *next;
int i;
- if (tev->event)
- free(tev->event);
- if (tev->group)
- free(tev->group);
- if (tev->point.symbol)
- free(tev->point.symbol);
- if (tev->point.module)
- free(tev->point.module);
+ free(tev->event);
+ free(tev->group);
+ free(tev->point.symbol);
+ 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);
- if (tev->args[i].value)
- free(tev->args[i].value);
- if (tev->args[i].type)
- free(tev->args[i].type);
+ free(tev->args[i].name);
+ free(tev->args[i].value);
+ free(tev->args[i].type);
ref = tev->args[i].ref;
while (ref) {
next = ref->next;
ref = tev->args[i].ref;
while (ref) {
next = ref->next;
- if (tev->args)
- free(tev->args);
memset(tev, 0, sizeof(*tev));
}
memset(tev, 0, sizeof(*tev));
}
if (ret < 0) {
/* Free vlist for error */
while (af.nvls--) {
if (ret < 0) {
/* Free vlist for error */
while (af.nvls--) {
- if (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);
+ free(af.vls[af.nvls].point.symbol);
+ strlist__delete(af.vls[af.nvls].vars);
}
free(af.vls);
*vls = NULL;
}
free(af.vls);
*vls = NULL;
if (fname) {
ppt->file = strdup(fname);
if (ppt->file == NULL) {
if (fname) {
ppt->file = strdup(fname);
if (ppt->file == NULL) {
- if (ppt->function) {
- free(ppt->function);
- ppt->function = NULL;
- }
+ free(ppt->function);
+ ppt->function = NULL;
ret = -ENOMEM;
goto end;
}
ret = -ENOMEM;
goto end;
}
zero_flag_atom = 0;
break;
case PRINT_FIELD:
zero_flag_atom = 0;
break;
case PRINT_FIELD:
- if (cur_field_name)
- free(cur_field_name);
cur_field_name = strdup(args->field.name);
break;
case PRINT_FLAGS:
cur_field_name = strdup(args->field.name);
break;
case PRINT_FLAGS:
zero_flag_atom = 0;
break;
case PRINT_FIELD:
zero_flag_atom = 0;
break;
case PRINT_FIELD:
- if (cur_field_name)
- free(cur_field_name);
cur_field_name = strdup(args->field.name);
break;
case PRINT_FLAGS:
cur_field_name = strdup(args->field.name);
break;
case PRINT_FLAGS: