Fix for bug #2250

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24294 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c
index 58ab444d370c8cd9ba7359e600eb753713ed01f9..927970a4a990f3585793e6b2a9df0e000440a590 100644 (file)
--- a/gtk/ansi_a_stat.c
+++ b/gtk/ansi_a_stat.c
@@ -78,7 +78,7 @@ typedef struct _ansi_a_stat_t {
 
 static ansi_a_stat_dlg_t       dlg_bsmap;
 static ansi_a_stat_dlg_t       dlg_dtap;
-static ansi_a_stat_t           stat;
+static ansi_a_stat_t           ansi_a_stat;
 
 
 static void
@@ -398,7 +398,7 @@ ansi_a_stat_gtk_bsmap_cb(
        i++;
     }
 
-    ansi_a_stat_draw(&stat);
+    ansi_a_stat_draw(&ansi_a_stat);
 }
 
 
@@ -445,7 +445,7 @@ ansi_a_stat_gtk_dtap_cb(
        i++;
     }
 
-    ansi_a_stat_draw(&stat);
+    ansi_a_stat_draw(&ansi_a_stat);
 }
 
 
@@ -464,10 +464,10 @@ register_tap_listener_gtkansi_a_stat(void)
     GString            *err_p;
 
 
-    memset((void *) &stat, 0, sizeof(ansi_a_stat_t));
+    memset((void *) &ansi_a_stat, 0, sizeof(ansi_a_stat_t));
 
     err_p =
-       register_tap_listener("ansi_a", &stat, NULL,
+       register_tap_listener("ansi_a", &ansi_a_stat, NULL,
            ansi_a_stat_reset,
            ansi_a_stat_packet,
            ansi_a_stat_draw);

diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c
index b17fa7dca43432b7a91bc864910da5c3360b5c12..b045e9c8c1f330b5d16fdc654c1755a30e22ee1f 100644 (file)
--- a/gtk/ansi_map_stat.c
+++ b/gtk/ansi_map_stat.c
@@ -91,7 +91,7 @@ typedef struct _ansi_map_stat_t {
 } ansi_map_stat_t;
 
 static ansi_map_stat_dlg_t     dlg;
-static ansi_map_stat_t         stat;
+static ansi_map_stat_t         ansi_a_stat;
 
 
 static void
@@ -408,7 +408,7 @@ ansi_map_stat_gtk_cb(
        i++;
     }
 
-    ansi_map_stat_draw(&stat);
+    ansi_map_stat_draw(&ansi_a_stat);
 }
 
 
@@ -427,10 +427,10 @@ register_tap_listener_gtkansi_map_stat(void)
     GString            *err_p;
 
 
-    memset((void *) &stat, 0, sizeof(ansi_map_stat_t));
+    memset((void *) &ansi_a_stat, 0, sizeof(ansi_map_stat_t));
 
     err_p =
-       register_tap_listener("ansi_map", &stat, NULL,
+       register_tap_listener("ansi_map", &ansi_a_stat, NULL,
            ansi_map_stat_reset,
            ansi_map_stat_packet,
            ansi_map_stat_draw);

diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index f6cd98d7b1658304a8f0a172ccacf149eb1e9038..b4b23d2b9964975ab10786694ffdd90008f38f06 100644 (file)
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -90,7 +90,7 @@ static gsm_a_stat_dlg_t               dlg_dtap_gmm;
 static gsm_a_stat_dlg_t                dlg_dtap_sms;
 static gsm_a_stat_dlg_t                dlg_dtap_sm;
 static gsm_a_stat_dlg_t                dlg_dtap_ss;
-static gsm_a_stat_t            stat;
+static gsm_a_stat_t            gsm_a_stat;
 
 
 static void
@@ -485,7 +485,7 @@ gsm_a_stat_gtk_bssmap_cb(
        i++;
     }
 
-    gsm_a_stat_draw(&stat);
+    gsm_a_stat_draw(&gsm_a_stat);
 }
 
 
@@ -536,7 +536,7 @@ gsm_a_stat_gtk_dtap_cb(
        i++;
     }
 
-    gsm_a_stat_draw(&stat);
+    gsm_a_stat_draw(&gsm_a_stat);
 }
 
 static void
@@ -666,10 +666,10 @@ register_tap_listener_gtkgsm_a_stat(void)
     GString            *err_p;
 
 
-    memset((void *) &stat, 0, sizeof(gsm_a_stat_t));
+    memset((void *) &gsm_a_stat, 0, sizeof(gsm_a_stat_t));
 
     err_p =
-       register_tap_listener("gsm_a", &stat, NULL,
+       register_tap_listener("gsm_a", &gsm_a_stat, NULL,
            gsm_a_stat_reset,
            gsm_a_stat_packet,
            gsm_a_stat_draw);