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/ftypes | |
| 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/ftypes')
| -rw-r--r-- | epan/ftypes/ftype-pcre.c | 8 | ||||
| -rw-r--r-- | epan/ftypes/ftype-string.c | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/epan/ftypes/ftype-pcre.c b/epan/ftypes/ftype-pcre.c index 7b9c717a09..01b01f1bb1 100644 --- a/epan/ftypes/ftype-pcre.c +++ b/epan/ftypes/ftype-pcre.c @@ -86,10 +86,10 @@ static void pcre_tuple_free(pcre_tuple_t *tuple) { if (tuple) { - if (tuple->string) g_free(tuple->string); - if (tuple->re) g_free(tuple->re); - if (tuple->ex) g_free(tuple->ex); - if (tuple->error) g_free(tuple->error); + g_free(tuple->string); + g_free(tuple->re); + g_free(tuple->ex); + g_free(tuple->error); g_free(tuple); } } diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c index 4a41c55dcf..0e60bc2a2a 100644 --- a/epan/ftypes/ftype-string.c +++ b/epan/ftypes/ftype-string.c @@ -45,9 +45,7 @@ string_fvalue_new(fvalue_t *fv) static void string_fvalue_free(fvalue_t *fv) { - if (fv->value.string) { - g_free(fv->value.string); - } + g_free(fv->value.string); } static void |