aboutsummaryrefslogtreecommitdiffstats
path: root/ui/mcast_stream.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2016-06-19 11:01:56 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2016-06-19 10:47:10 +0000
commita383e692c8774c2451a55d8b3f8ef9db5d037329 (patch)
treeab6223527915ab1127a50563981816adc18b971f /ui/mcast_stream.c
parentff845123f1f1ecef0d8e0d8980e6e9d7267e5f6b (diff)
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 <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'ui/mcast_stream.c')
-rw-r--r--ui/mcast_stream.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/mcast_stream.c b/ui/mcast_stream.c
index 4daca8b7d2..badc1fcf36 100644
--- a/ui/mcast_stream.c
+++ b/ui/mcast_stream.c
@@ -259,7 +259,7 @@ mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
/* increment the packets counter for this stream and calculate average pps */
++(strinfo->npackets);
-
+
if (deltatime > 0) {
strinfo->apackets = strinfo->npackets / deltatime;
strinfo->average_bw = ((double)(strinfo->total_bytes*8) / deltatime);
@@ -332,7 +332,7 @@ remove_tap_listener_mcast_stream(mcaststream_tapinfo_t *tapinfo)
void
register_tap_listener_mcast_stream(mcaststream_tapinfo_t *tapinfo)
{
- gchar *error_string;
+ GString *error_string;
if (!tapinfo) {
return;
@@ -345,8 +345,8 @@ register_tap_listener_mcast_stream(mcaststream_tapinfo_t *tapinfo)
if (error_string != NULL) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
- "%s", error_string);
- wmem_free(NULL, error_string);
+ "%s", error_string->str);
+ g_string_free(error_string, TRUE);
exit(1);
}