diff options
| author | Ahmad Fatoum <ahmad@a3f.at> | 2017-08-26 10:30:47 +0200 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-10-15 12:38:51 +0000 |
| commit | 9d49e1316689ae05d31efc866f04ac12cd051085 (patch) | |
| tree | f51b835fd490fe6be49268a114014f597f47c252 /epan/color_filters.c | |
| parent | 37ccb77a1ab845075465c2d86eea9e8e21abc273 (diff) | |
Remove superfluous null-checks before strdup/free
NULL checks were removed for following free functions:
- g_free "If mem is NULL it simply returns"
https://developer.gnome.org/glib/stable/glib-Memory-Allocation.html#g-free
- g_slist_free(_full)? "NULL is considered to be the empty list"
https://developer.gnome.org/glib/stable/glib-Singly-Linked-Lists.html
- g_strfreev "If str_array is NULL, this function simply returns."
https://developer.gnome.org/glib/stable/glib-String-Utility-Functions.html#g-strfreev
- g_slice_free "If mem is NULL, this macro does nothing."
https://developer.gnome.org/glib/stable/glib-Memory-Slices.html#g-slice-free
- g_match_info_free "not NULL... otherwise does nothing"
https://developer.gnome.org/glib/stable/glib-Perl-compatible-regular-expressions.html#g-match-info-free
- dfilter_free defined in Wireshark code. Returns early when passed NULL
epan/dfilter/dfilter.c
They were also removed around calls to g_strdup where applicable:
- g_strdup "If str is NULL it returns NULL."
https://developer.gnome.org/glib/stable/glib-String-Utility-Functions.html#g-strdup
Change-Id: Ie80c2db89bef531edc3aed7b7c9f654e1d654d04
Reviewed-on: https://code.wireshark.org/review/23406
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/color_filters.c')
| -rw-r--r-- | epan/color_filters.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/epan/color_filters.c b/epan/color_filters.c index 3a184bb3a8..da0dd96512 100644 --- a/epan/color_filters.c +++ b/epan/color_filters.c @@ -173,10 +173,8 @@ color_filters_set_tmp(guint8 filt_nr, const gchar *filter, gboolean disabled, gc g_free(local_err_msg); return FALSE; } else { - if (colorf->filter_text != NULL) - g_free(colorf->filter_text); - if (colorf->c_colorfilter != NULL) - dfilter_free(colorf->c_colorfilter); + g_free(colorf->filter_text); + dfilter_free(colorf->c_colorfilter); colorf->filter_text = g_strdup(tmpfilter); colorf->c_colorfilter = compiled_filter; colorf->disabled = ((i!=filt_nr) ? TRUE : disabled); @@ -225,12 +223,9 @@ color_filters_reset_tmp(gchar **err_msg) void color_filter_delete(color_filter_t *colorf) { - if (colorf->filter_name != NULL) - g_free(colorf->filter_name); - if (colorf->filter_text != NULL) - g_free(colorf->filter_text); - if (colorf->c_colorfilter != NULL) - dfilter_free(colorf->c_colorfilter); + g_free(colorf->filter_name); + g_free(colorf->filter_text); + dfilter_free(colorf->c_colorfilter); g_free(colorf); } |