aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-user_encap.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2009-03-13 22:06:48 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2009-03-13 22:06:48 +0000
commit62f60df6b4966d4e3d7f478284768115ef150b20 (patch)
tree259b574936077d87b88ed6d0429ba317078e0fcc /epan/dissectors/packet-user_encap.c
parent7ed615f165fcb0cc87c2aba1921fb87a8a384ca5 (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/dissectors/packet-user_encap.c')
-rw-r--r--epan/dissectors/packet-user_encap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c
index 26d54ebb82..7859883f5a 100644
--- a/epan/dissectors/packet-user_encap.c
+++ b/epan/dissectors/packet-user_encap.c
@@ -142,9 +142,9 @@ static void user_free_cb(void* record)
{
user_encap_t *u = record;
- if (u->payload_proto_name) g_free(u->payload_proto_name);
- if (u->header_proto_name) g_free(u->header_proto_name);
- if (u->trailer_proto_name) g_free(u->trailer_proto_name);
+ g_free(u->payload_proto_name);
+ g_free(u->header_proto_name);
+ g_free(u->trailer_proto_name);
}
UAT_VS_DEF(user_encap, encap, user_encap_t, WTAP_ENCAP_USER0, ENCAP0_STR)