diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-10-04 08:30:36 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-10-04 08:30:36 +0000 |
| commit | 3c9efdf4784d22a4a1a04a256acb50a815f59348 (patch) | |
| tree | dd8723e71887cc681dd075b04afe17d4455121e7 /mergecap.c | |
| parent | f52303ffc9a0d12894edca2af06cf064f46a2a91 (diff) | |
| download | wireshark-3c9efdf4784d22a4a1a04a256acb50a815f59348.tar.gz | |
Use longs as file offsets, so that on platforms with 64-bit "long" we
can handle capture files bigger than 2GB.
svn path=/trunk/; revision=3993
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mergecap.c b/mergecap.c index ac84d42c20..79966f5dfb 100644 --- a/mergecap.c +++ b/mergecap.c @@ -1,6 +1,6 @@ /* Combine two dump files, either by appending or by merging by timestamp * - * $Id: mergecap.c,v 1.4 2001/07/20 07:22:40 guy Exp $ + * $Id: mergecap.c,v 1.5 2001/10/04 08:30:33 guy Exp $ * * Written by Scott Renfro <scott@renfro.org> based on * editcap by Richard Sharpe and Guy Harris @@ -47,7 +47,7 @@ typedef struct in_file_t { const char *filename; wtap *wth; int err; - int data_offset; + long data_offset; gboolean ok; } in_file_t; @@ -65,7 +65,7 @@ static out_file_t out_file; * Routine to write frame to output file */ static void -write_frame(u_char *user, const struct wtap_pkthdr *phdr, int offset, +write_frame(u_char *user, const struct wtap_pkthdr *phdr, long offset, union wtap_pseudo_header *pseudo_header, const u_char *buf) { wtap_dumper *pdh = (wtap_dumper*)user; |