tools: Remove redundant NULL checks before free() (found by Smatch).

This commit is contained in:
Michael Stefaniuc 2006-10-09 23:34:53 +02:00 committed by Alexandre Julliard
parent 5cecceccb2
commit 0fb444b58c
6 changed files with 11 additions and 23 deletions

View File

@ -1179,7 +1179,7 @@ static typeref_t *uniq_tref(typeref_t *ref)
static type_t *type_ref(typeref_t *ref)
{
type_t *t = ref->ref;
if (ref->name) free(ref->name);
free(ref->name);
free(ref);
return t;
}

View File

@ -37,7 +37,7 @@ typedef struct _compound_type
#define INIT_CT(ct) do { memset (&ct, 0, sizeof (ct)); } while (0)
/* free the memory used by a compound structure */
#define FREE_CT(ct) do { if (ct.expression) free (ct.expression); } while (0)
#define FREE_CT(ct) free (ct.expression)
/* Flags for data types */
#define DATA_VTABLE 0x1

View File

@ -348,10 +348,7 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg)
void search_cleanup (void) __attribute__ ((destructor));
void search_cleanup (void)
{
if (grep_buff)
free (grep_buff);
if (fgrep_buff)
free (fgrep_buff);
free (grep_buff);
free (fgrep_buff);
}
#endif

View File

@ -109,19 +109,13 @@ void symbol_clear(parsed_symbol *sym)
assert (sym->symbol);
free (sym->symbol);
if (sym->return_text)
free (sym->return_text);
if (sym->function_name)
free (sym->function_name);
free (sym->return_text);
free (sym->function_name);
for (i = sym->argc - 1; i >= 0; i--)
{
if (sym->arg_text [i])
free (sym->arg_text [i]);
if (sym->arg_name [i])
free (sym->arg_name [i]);
free (sym->arg_text [i]);
free (sym->arg_name [i]);
}
memset (sym, 0, sizeof (parsed_symbol));
}

View File

@ -274,8 +274,7 @@ void write_h_file(const char *fname)
internal_error(__FILE__, __LINE__, "Invalid base for number print");
}
free(cptr);
if(cast)
free(cast);
free(cast);
break;
default:
internal_error(__FILE__, __LINE__, "Invalid node type %d", ndp->type);

View File

@ -2906,10 +2906,8 @@ static resource_t *build_fontdirs(resource_t *tail)
free(lanfnt);
clean:
if(fnt)
free(fnt);
if(fnd)
free(fnd);
free(fnt);
free(fnd);
free(str.str.cstr);
return lst;
}