diff options
author | Guy Harris <guy@alum.mit.edu> | 2002-07-29 06:09:59 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2002-07-29 06:09:59 +0000 |
commit | 6e21561be8a3f9a29a438ea945b7be7b933fc159 (patch) | |
tree | 8e70c43d1f42de696be79b546042e67623be1c06 /wiretap/i4btrace.c | |
parent | 4298a1f07da62f4791fcb5664fa5ba43b29944a3 (diff) | |
download | wireshark-6e21561be8a3f9a29a438ea945b7be7b933fc159.tar.gz wireshark-6e21561be8a3f9a29a438ea945b7be7b933fc159.tar.bz2 wireshark-6e21561be8a3f9a29a438ea945b7be7b933fc159.zip |
From Joerg Mayer:
All files:
- Replace types from sys/types.h by those from glib.h
- Replace ntoh family of macros from netinet/in.h and winsock2.h
by g_ntoh family from glib.h
- Remove now unneeded includes of sys/types.h, netinet/in.h and
winsock2.h
wtap.h
Move includes to the top
svn path=/trunk/; revision=5909
Diffstat (limited to 'wiretap/i4btrace.c')
-rw-r--r-- | wiretap/i4btrace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/i4btrace.c b/wiretap/i4btrace.c index 1ed623fd16..097608d87b 100644 --- a/wiretap/i4btrace.c +++ b/wiretap/i4btrace.c @@ -1,6 +1,6 @@ /* i4btrace.c * - * $Id: i4btrace.c,v 1.21 2002/06/07 07:27:34 guy Exp $ + * $Id: i4btrace.c,v 1.22 2002/07/29 06:09:58 guy Exp $ * * Wiretap Library * Copyright (c) 1999 by Bert Driehuis <driehuis@playbeing.org> @@ -34,10 +34,10 @@ static gboolean i4btrace_read(wtap *wth, int *err, long *data_offset); static gboolean i4btrace_seek_read(wtap *wth, long seek_off, - union wtap_pseudo_header *pseudo_header, u_char *pd, int length, int *err); + union wtap_pseudo_header *pseudo_header, guchar *pd, int length, int *err); static int i4b_read_rec_header(FILE_T fh, i4b_trace_hdr_t *hdr, int *err); static void i4b_byte_swap_header(wtap *wth, i4b_trace_hdr_t *hdr); -static gboolean i4b_read_rec_data(FILE_T fh, u_char *pd, int length, int *err); +static gboolean i4b_read_rec_data(FILE_T fh, guchar *pd, int length, int *err); static void i4b_set_pseudo_header(wtap *wth, i4b_trace_hdr_t *hdr, union wtap_pseudo_header *pseudo_header); static void i4btrace_close(wtap *wth); @@ -223,7 +223,7 @@ static gboolean i4btrace_read(wtap *wth, int *err, long *data_offset) static gboolean i4btrace_seek_read(wtap *wth, long seek_off, - union wtap_pseudo_header *pseudo_header, u_char *pd, int length, int *err) + union wtap_pseudo_header *pseudo_header, guchar *pd, int length, int *err) { int ret; i4b_trace_hdr_t hdr; @@ -290,7 +290,7 @@ i4b_byte_swap_header(wtap *wth, i4b_trace_hdr_t *hdr) } static gboolean -i4b_read_rec_data(FILE_T fh, u_char *pd, int length, int *err) +i4b_read_rec_data(FILE_T fh, guchar *pd, int length, int *err) { int bytes_read; |