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-tcp-stream.c | |
| parent | 2aa55a387a87cd4f740aea661ca1ca535cd2e392 (diff) | |
| download | wireshark-2e9f3c5d366eaa7139fc877b5301392166b3f985.tar.gz | |
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-tcp-stream.c')
| -rw-r--r-- | ui/tap-tcp-stream.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c index abf357683d..7e40785cf9 100644 --- a/ui/tap-tcp-stream.c +++ b/ui/tap-tcp-stream.c @@ -116,7 +116,7 @@ void graph_segment_list_get(capture_file *cf, struct tcp_graph *tg, gboolean stream_known) { struct segment current; - GString *error_string; + gchar *error_string; tcp_scan_t ts; g_log(NULL, G_LOG_LEVEL_DEBUG, "graph_segment_list_get()"); @@ -152,8 +152,8 @@ graph_segment_list_get(capture_file *cf, struct tcp_graph *tg, gboolean stream_k error_string = register_tap_listener("tcp", &ts, "tcp", 0, NULL, tapall_tcpip_packet, NULL); if (error_string) { fprintf(stderr, "wireshark: Couldn't register tcp_graph tap: %s\n", - error_string->str); - g_string_free(error_string, TRUE); + error_string); + wmem_free(NULL, error_string); exit(1); /* XXX: fix this */ } cf_retap_packets(cf); @@ -288,7 +288,7 @@ select_tcpip_session(capture_file *cf, struct segment *hdrs) epan_dissect_t edt; dfilter_t *sfcode; gchar *err_msg; - GString *error_string; + gchar *error_string; nstime_t rel_ts; th_t th = {0, {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}}; @@ -312,8 +312,8 @@ select_tcpip_session(capture_file *cf, struct segment *hdrs) error_string=register_tap_listener("tcp", &th, NULL, 0, NULL, tap_tcpip_packet, NULL); if (error_string) { fprintf(stderr, "wireshark: Couldn't register tcp_graph tap: %s\n", - error_string->str); - g_string_free(error_string, TRUE); + error_string); + wmem_free(NULL, error_string); exit(1); } |