diff options
author | Dario Lombardo <lomato@gmail.com> | 2016-05-03 18:40:17 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2016-06-17 15:38:03 +0000 |
commit | 2e9f3c5d366eaa7139fc877b5301392166b3f985 (patch) | |
tree | ac2d04b7cc1b8d6c8962d437584e351fcf1bf450 /ui/tap_export_pdu.c | |
parent | 2aa55a387a87cd4f740aea661ca1ca535cd2e392 (diff) |
tap: change glib functions to wmem.
Change-Id: I878ae6b121a669f9b7f4e1e57bc079f0cb44c0bf
Reviewed-on: https://code.wireshark.org/review/15270
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/tap_export_pdu.c')
-rw-r--r-- | ui/tap_export_pdu.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index a151e72567..87420435c3 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -177,13 +177,11 @@ exp_pdu_close(exp_pdu_t *exp_pdu_tap_data) char * exp_pdu_pre_open(const char *tap_name, const char *filter, exp_pdu_t *exp_pdu_tap_data) { - GString *error_string; - /* XXX: can we always assume WTAP_ENCAP_WIRESHARK_UPPER_PDU? */ exp_pdu_tap_data->pkt_encap = wtap_wtap_encap_to_pcap_encap(WTAP_ENCAP_WIRESHARK_UPPER_PDU); /* Register this tap listener now */ - error_string = register_tap_listener(tap_name, /* The name of the tap we want to listen to */ + return register_tap_listener(tap_name, /* The name of the tap we want to listen to */ exp_pdu_tap_data, /* instance identifier/pointer to a struct holding * all state variables */ filter, /* pointer to a filter string */ @@ -191,10 +189,6 @@ exp_pdu_pre_open(const char *tap_name, const char *filter, exp_pdu_t *exp_pdu_ta NULL, export_pdu_packet, NULL); - if (error_string != NULL) - return g_string_free(error_string, FALSE); - - return NULL; } |