diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-03-13 22:06:48 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-03-13 22:06:48 +0000 |
| commit | 62f60df6b4966d4e3d7f478284768115ef150b20 (patch) | |
| tree | 259b574936077d87b88ed6d0429ba317078e0fcc /epan/dfilter | |
| parent | 7ed615f165fcb0cc87c2aba1921fb87a8a384ca5 (diff) | |
From Jakub Zawadzki (bug 3331):
g_free() is NULL safe, so we don't need check against it.
svn path=/trunk/; revision=27718
Diffstat (limited to 'epan/dfilter')
| -rw-r--r-- | epan/dfilter/dfilter-macro.c | 8 | ||||
| -rw-r--r-- | epan/dfilter/dfilter.c | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/epan/dfilter/dfilter-macro.c b/epan/dfilter/dfilter-macro.c index a6601c4ce4..531aff9111 100644 --- a/epan/dfilter/dfilter-macro.c +++ b/epan/dfilter/dfilter-macro.c @@ -61,7 +61,7 @@ void dump_dfilter_macro_t(const dfilter_macro_t *m, const char *function, const static gboolean free_value(gpointer k _U_, gpointer v, gpointer u _U_) { fvt_cache_entry_t* e = v; - if (e->repr) g_free(e->repr); + g_free(e->repr); g_free(e); return TRUE; } @@ -465,12 +465,10 @@ static void macro_update(void* mp, const gchar** error) { done: g_ptr_array_add(parts,NULL); - if (m->parts) g_free(m->parts); - + g_free(m->parts); m->parts = (gchar**)parts->pdata; - if (m->args_pos) g_free(m->args_pos); - + g_free(m->args_pos); m->args_pos = (int*)(void *)args_pos->data; g_ptr_array_free(parts,FALSE); diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c index 13e489110c..6bc1bcd12d 100644 --- a/epan/dfilter/dfilter.c +++ b/epan/dfilter/dfilter.c @@ -150,9 +150,7 @@ dfilter_free(dfilter_t *df) free_insns(df->consts); } - if (df->interesting_fields) { - g_free(df->interesting_fields); - } + g_free(df->interesting_fields); /* clear registers */ for (i = 0; i < df->max_registers; i++) { |