X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=wiretap%2Fiptrace.c;h=e1f1858bdf5e836a00498bb3f7ea1194075c9c82;hp=e4e0500195ed60e9e58fb745863a8cbf7d22b5a6;hb=7e3e26665b938adf9d5de03715e29ddbda89edf2;hpb=bf5d8d18e36e02f7f197738afc830e2c4341dd69

diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c
index e4e0500195..e1f1858bdf 100644
--- a/wiretap/iptrace.c
+++ b/wiretap/iptrace.c
@@ -35,13 +35,13 @@
 static gboolean iptrace_read_1_0(wtap *wth, int *err, gchar **err_info,
     gint64 *data_offset);
 static gboolean iptrace_seek_read_1_0(wtap *wth, gint64 seek_off,
-    union wtap_pseudo_header *pseudo_header, guchar *pd, int packet_size,
+    union wtap_pseudo_header *pseudo_header, guint8 *pd, int packet_size,
     int *err, gchar **err_info);
 
 static gboolean iptrace_read_2_0(wtap *wth, int *err, gchar **err_info,
     gint64 *data_offset);
 static gboolean iptrace_seek_read_2_0(wtap *wth, gint64 seek_off,
-    union wtap_pseudo_header *pseudo_header, guchar *pd, int packet_size,
+    union wtap_pseudo_header *pseudo_header, guint8 *pd, int packet_size,
     int *err, gchar **err_info);
 
 static int iptrace_read_rec_header(FILE_T fh, guint8 *header, int header_len,
@@ -131,7 +131,7 @@ static gboolean iptrace_read_1_0(wtap *wth, int *err, gchar **err_info,
 	guint8			header[IPTRACE_1_0_PHDR_SIZE];
 	guint8			*data_ptr;
 	iptrace_1_0_phdr	pkt_hdr;
-	guchar			fddi_padding[3];
+	guint8			fddi_padding[3];
 
 	/* Read the descriptor data */
 	*data_offset = wth->data_offset;
@@ -214,13 +214,13 @@ static gboolean iptrace_read_1_0(wtap *wth, int *err, gchar **err_info,
 }
 
 static gboolean iptrace_seek_read_1_0(wtap *wth, gint64 seek_off,
-    union wtap_pseudo_header *pseudo_header, guchar *pd, int packet_size,
+    union wtap_pseudo_header *pseudo_header, guint8 *pd, int packet_size,
     int *err, gchar **err_info)
 {
 	int			ret;
 	guint8			header[IPTRACE_1_0_PHDR_SIZE];
 	int			pkt_encap;
-	guchar			fddi_padding[3];
+	guint8			fddi_padding[3];
 
 	if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
 		return FALSE;
@@ -314,7 +314,7 @@ static gboolean iptrace_read_2_0(wtap *wth, int *err, gchar **err_info,
 	guint8			header[IPTRACE_2_0_PHDR_SIZE];
 	guint8			*data_ptr;
 	iptrace_2_0_phdr	pkt_hdr;
-	guchar			fddi_padding[3];
+	guint8			fddi_padding[3];
 
 	/* Read the descriptor data */
 	*data_offset = wth->data_offset;
@@ -397,13 +397,13 @@ static gboolean iptrace_read_2_0(wtap *wth, int *err, gchar **err_info,
 }
 
 static gboolean iptrace_seek_read_2_0(wtap *wth, gint64 seek_off,
-    union wtap_pseudo_header *pseudo_header, guchar *pd, int packet_size,
+    union wtap_pseudo_header *pseudo_header, guint8 *pd, int packet_size,
     int *err, gchar **err_info)
 {
 	int			ret;
 	guint8			header[IPTRACE_2_0_PHDR_SIZE];
 	int			pkt_encap;
-	guchar			fddi_padding[3];
+	guint8			fddi_padding[3];
 
 	if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
 		return FALSE;