aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-http.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-http.c')
-rw-r--r--epan/dissectors/packet-http.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index 3fa12a6c7c..afba5ec4a3 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -211,17 +211,8 @@ header_fields_copy_cb(void* n, const void* o, size_t siz _U_)
header_field_t* new_rec = (header_field_t*)n;
const header_field_t* old_rec = (const header_field_t*)o;
- if (old_rec->header_name) {
- new_rec->header_name = g_strdup(old_rec->header_name);
- } else {
- new_rec->header_name = NULL;
- }
-
- if (old_rec->header_desc) {
- new_rec->header_desc = g_strdup(old_rec->header_desc);
- } else {
- new_rec->header_desc = NULL;
- }
+ new_rec->header_name = g_strdup(old_rec->header_name);
+ new_rec->header_desc = g_strdup(old_rec->header_desc);
return new_rec;
}
@@ -231,10 +222,8 @@ header_fields_free_cb(void*r)
{
header_field_t* rec = (header_field_t*)r;
- if (rec->header_name)
- g_free(rec->header_name);
- if (rec->header_desc)
- g_free(rec->header_desc);
+ g_free(rec->header_name);
+ g_free(rec->header_desc);
}
UAT_CSTRING_CB_DEF(header_fields, header_name, header_field_t)