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/dissectors/packet-xml.c | |
| 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/dissectors/packet-xml.c')
| -rw-r--r-- | epan/dissectors/packet-xml.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c index cc09fc0a02..a2d6152b60 100644 --- a/epan/dissectors/packet-xml.c +++ b/epan/dissectors/packet-xml.c @@ -793,15 +793,13 @@ static void add_xmlpi_namespace(gpointer k _U_, gpointer v, gpointer p) { } static void destroy_dtd_data(dtd_build_data_t* dtd_data) { - - if(dtd_data->proto_name) g_free(dtd_data->proto_name); - if(dtd_data->media_type) g_free(dtd_data->media_type); - if(dtd_data->description) g_free(dtd_data->description); - if(dtd_data->proto_root) g_free(dtd_data->proto_root); + g_free(dtd_data->proto_name); + g_free(dtd_data->media_type); + g_free(dtd_data->description); + g_free(dtd_data->proto_root); g_string_free(dtd_data->error,TRUE); - while(dtd_data->elements->len) { dtd_named_list_t* nl = g_ptr_array_remove_index_fast(dtd_data->elements,0); g_ptr_array_free(nl->list,TRUE); @@ -819,10 +817,8 @@ static void destroy_dtd_data(dtd_build_data_t* dtd_data) { g_ptr_array_free(dtd_data->attributes,TRUE); g_free(dtd_data); - } - static void copy_attrib_item(gpointer k, gpointer v _U_, gpointer p) { gchar* key = g_strdup(k); int* value = g_malloc(sizeof(int)); @@ -1036,8 +1032,7 @@ next_attribute: /* if a proto_root is defined in the dtd we'll use that as root */ if( dtd_data->proto_root ) { - if(root_name) - g_free(root_name); + g_free(root_name); root_name = g_strdup(dtd_data->proto_root); } @@ -1186,9 +1181,7 @@ next_attribute: g_hash_table_destroy(elements); destroy_dtd_data(dtd_data); - - if (root_name) - g_free(root_name); + g_free(root_name); } # define DIRECTORY_T GDir |