From a383e692c8774c2451a55d8b3f8ef9db5d037329 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Sun, 19 Jun 2016 11:01:56 +0200 Subject: Revert "tap: change glib functions to wmem." This reverts commit 2e9f3c5d366eaa7139fc877b5301392166b3f985. It breaks the registration of codec, dissector and libwiretap plugins. Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de Reviewed-on: https://code.wireshark.org/review/16012 Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin --- rawshark.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rawshark.c') diff --git a/rawshark.c b/rawshark.c index ee7d3b4ce0..cd59d9fdf9 100644 --- a/rawshark.c +++ b/rawshark.c @@ -1332,7 +1332,7 @@ protocolinfo_init(char *field) { pci_t *rs; header_field_info *hfi; - gchar *error_string; + GString *error_string; char hfibuf[100]; hfi=proto_registrar_get_byname(field); @@ -1356,8 +1356,8 @@ protocolinfo_init(char *field) if(error_string){ /* error, we failed to attach to the tap. complain and clean up */ fprintf(stderr, "rawshark: Couldn't register field extraction tap: %s\n", - error_string); - wmem_free(NULL, error_string); + error_string->str); + g_string_free(error_string, TRUE); if(rs->filter){ g_free(rs->filter); } -- cgit v1.2.3