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/iptrace.c | |
| parent | 4298a1f07da62f4791fcb5664fa5ba43b29944a3 (diff) | |
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/iptrace.c')
| -rw-r--r-- | wiretap/iptrace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c index 945d842cdf..03690ad379 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -1,6 +1,6 @@ /* iptrace.c * - * $Id: iptrace.c,v 1.41 2002/06/07 07:27:34 guy Exp $ + * $Id: iptrace.c,v 1.42 2002/07/29 06:09:58 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -34,12 +34,12 @@ static gboolean iptrace_read_1_0(wtap *wth, int *err, long *data_offset); static gboolean iptrace_seek_read_1_0(wtap *wth, long seek_off, - union wtap_pseudo_header *pseudo_header, u_char *pd, int packet_size, + union wtap_pseudo_header *pseudo_header, guchar *pd, int packet_size, int *err); static gboolean iptrace_read_2_0(wtap *wth, int *err, long *data_offset); static gboolean iptrace_seek_read_2_0(wtap *wth, long seek_off, - union wtap_pseudo_header *pseudo_header, u_char *pd, int packet_size, + union wtap_pseudo_header *pseudo_header, guchar *pd, int packet_size, int *err); static int iptrace_read_rec_header(FILE_T fh, guint8 *header, int header_len, @@ -166,7 +166,7 @@ static gboolean iptrace_read_1_0(wtap *wth, int *err, long *data_offset) } static gboolean iptrace_seek_read_1_0(wtap *wth, long seek_off, - union wtap_pseudo_header *pseudo_header, u_char *pd, int packet_size, + union wtap_pseudo_header *pseudo_header, guchar *pd, int packet_size, int *err) { int ret; @@ -287,7 +287,7 @@ static gboolean iptrace_read_2_0(wtap *wth, int *err, long *data_offset) } static gboolean iptrace_seek_read_2_0(wtap *wth, long seek_off, - union wtap_pseudo_header *pseudo_header, u_char *pd, int packet_size, + union wtap_pseudo_header *pseudo_header, guchar *pd, int packet_size, int *err) { int ret; |