Get rid of -Wshadow warning - I guess we're including something that

[metze/wireshark/wip.git] / ui / cli / tap-ansi_astat.c

diff --git a/ui/cli/tap-ansi_astat.c b/ui/cli/tap-ansi_astat.c
index ee368abb748bd4a76bcfc35bddd0c2449667d7cb..90518541f234dcffdc9d074da73605740ac0b090 100644 (file)
--- a/ui/cli/tap-ansi_astat.c
+++ b/ui/cli/tap-ansi_astat.c
@@ -21,23 +21,17 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /*
  * This TAP provides statistics for the ANSI A Interface:
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdio.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
 #include <string.h>
 #include "epan/packet_info.h"
 #include "epan/value_string.h"
@@ -60,8 +54,8 @@ ansi_a_stat_packet(
     epan_dissect_t             *edt _U_,
     const void                 *data)
 {
-    ansi_a_stat_t              *stat_p = tapdata;
-    const ansi_a_tap_rec_t     *tap_p = data;
+    ansi_a_stat_t              *stat_p = (ansi_a_stat_t *)tapdata;
+    const ansi_a_tap_rec_t     *tap_p = (const ansi_a_tap_rec_t *)data;
 
 
     switch (tap_p->pdu_type)
@@ -89,7 +83,7 @@ static void
 ansi_a_stat_draw(
     void               *tapdata)
 {
-    ansi_a_stat_t      *stat_p = tapdata;
+    ansi_a_stat_t      *stat_p = (ansi_a_stat_t *)tapdata;
     guint8             i;
 
 
@@ -134,12 +128,12 @@ ansi_a_stat_draw(
 
 
 static void
-ansi_a_stat_init(const char *optarg _U_, void* userdata _U_)
+ansi_a_stat_init(const char *opt_arg _U_, void* userdata _U_)
 {
     ansi_a_stat_t      *stat_p;
     GString            *err_p;
 
-    stat_p = g_malloc(sizeof(ansi_a_stat_t));
+    stat_p = (ansi_a_stat_t *)g_malloc(sizeof(ansi_a_stat_t));
 
     memset(stat_p, 0, sizeof(ansi_a_stat_t));