aboutsummaryrefslogtreecommitdiffstats
path: root/epan/expert.c
diff options
context:
space:
mode:
authorAhmad Fatoum <ahmad@a3f.at>2017-08-26 10:30:47 +0200
committerJoão Valverde <j@v6e.pt>2017-10-15 12:38:51 +0000
commit9d49e1316689ae05d31efc866f04ac12cd051085 (patch)
treef51b835fd490fe6be49268a114014f597f47c252 /epan/expert.c
parent37ccb77a1ab845075465c2d86eea9e8e21abc273 (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/expert.c')
-rw-r--r--epan/expert.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/epan/expert.c b/epan/expert.c
index c757634caf..4cf909c7c8 100644
--- a/epan/expert.c
+++ b/epan/expert.c
@@ -145,11 +145,7 @@ static void *uat_expert_copy_cb(void *n, const void *o, size_t siz _U_)
expert_level_entry_t *new_record = (expert_level_entry_t*)n;
const expert_level_entry_t *old_record = (const expert_level_entry_t *)o;
- if (old_record->field) {
- new_record->field = g_strdup(old_record->field);
- } else {
- new_record->field = NULL;
- }
+ new_record->field = g_strdup(old_record->field);
new_record->severity = old_record->severity;
@@ -160,8 +156,7 @@ static void uat_expert_free_cb(void*r)
{
expert_level_entry_t *rec = (expert_level_entry_t *)r;
- if (rec->field)
- g_free(rec->field);
+ g_free(rec->field);
}
static void uat_expert_post_update_cb(void)