diff options
author | Ulf Lamping <ulf.lamping@web.de> | 2006-11-05 22:46:44 +0000 |
---|---|---|
committer | Ulf Lamping <ulf.lamping@web.de> | 2006-11-05 22:46:44 +0000 |
commit | 59d6c8ea33b703a4282ac6694f2797202b64dfcb (patch) | |
tree | a4abb83c0c20eafb12ab250bcf7f32f74f281b44 /wiretap/network_instruments.c | |
parent | ed837bc7a517040020da2717b392a0ca086e276a (diff) | |
download | wireshark-59d6c8ea33b703a4282ac6694f2797202b64dfcb.tar.gz |
change all file offsets from long to gint64 so we can - theoretically - handle files > 2GB correct.
Please distclean Win32 builds!
svn path=/trunk/; revision=19814
Diffstat (limited to 'wiretap/network_instruments.c')
-rw-r--r-- | wiretap/network_instruments.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c index 6a7952fcf6..c36611ec3a 100644 --- a/wiretap/network_instruments.c +++ b/wiretap/network_instruments.c @@ -89,8 +89,8 @@ static void init_time_offset(void) } static gboolean observer_read(wtap *wth, int *err, gchar **err_info, - long *data_offset); -static gboolean observer_seek_read(wtap *wth, long seek_off, + gint64 *data_offset); +static gboolean observer_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_header *pseudo_header, guchar *pd, int length, int *err, gchar **err_info); static int read_packet_header(FILE_T fh, packet_entry_header *packet_header, @@ -230,7 +230,7 @@ int network_instruments_open(wtap *wth, int *err, gchar **err_info) /* reads the next packet */ static gboolean observer_read(wtap *wth, int *err, gchar **err_info, - long *data_offset) + gint64 *data_offset) { int offset; packet_entry_header packet_header; @@ -280,7 +280,7 @@ static gboolean observer_read(wtap *wth, int *err, gchar **err_info, GUINT64_FROM_LE(packet_header.nano_seconds_since_2000); wth->phdr.ts.secs = (time_t) (packet_header.nano_seconds_since_2000/1000000000 + seconds1970to2000); - wth->phdr.ts.nsecs = packet_header.nano_seconds_since_2000%1000000000; + wth->phdr.ts.nsecs = (int) (packet_header.nano_seconds_since_2000%1000000000); /* set-up the packet buffer */ buffer_assure_space(wth->frame_buffer, packet_header.captured_size); @@ -306,7 +306,7 @@ static gboolean observer_read(wtap *wth, int *err, gchar **err_info, } /* reads a packet at an offset */ -static gboolean observer_seek_read(wtap *wth, long seek_off, +static gboolean observer_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_header *pseudo_header, guchar *pd, int length, int *err, gchar **err_info) { |