diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-04-06 06:51:19 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-04-06 06:51:19 +0000 |
| commit | 4c93827e34e879111b00873b2cd7c823b6b69f88 (patch) | |
| tree | fdb9ea83c685200de45a790065fcc6be6a26fc88 /wiretap/packetlogger.c | |
| parent | c039f9f8a8bb04d2a8dcd6e2ec1facaee3f1f855 (diff) | |
From Jakub Zawadzki:
file_read(buf, bsize, count, file) macro is compilant with fread
function and takes elements count+ size of each element, however to make
it compilant with gzread() it always returns number of bytes.
In wiretap file_read() this is not really used, file_read is called
either with bsize set to 1 or count to 1.
Attached patch remove bsize argument from macro.
svn path=/trunk/; revision=36491
Diffstat (limited to 'wiretap/packetlogger.c')
| -rw-r--r-- | wiretap/packetlogger.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/packetlogger.c b/wiretap/packetlogger.c index edf0fed45a..956c11d9e8 100644 --- a/wiretap/packetlogger.c +++ b/wiretap/packetlogger.c @@ -68,7 +68,7 @@ int packetlogger_open(wtap *wth, int *err, gchar **err_info _U_) if(!packetlogger_read_header(&pl_hdr, wth->fh, err)) return -1; - if (file_read(&type, 1, 1, wth->fh) <= 0) + if (file_read(&type, 1, wth->fh) <= 0) return -1; /* Verify this file belongs to us */ @@ -110,7 +110,7 @@ packetlogger_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) } buffer_assure_space(wth->frame_buffer, pl_hdr.len - 8); - bytes_read = file_read(buffer_start_ptr(wth->frame_buffer), 1, + bytes_read = file_read(buffer_start_ptr(wth->frame_buffer), pl_hdr.len - 8, wth->fh); if(bytes_read != pl_hdr.len - 8) { @@ -156,7 +156,7 @@ packetlogger_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_header return FALSE; } - bytes_read = file_read(pd, 1, pl_hdr.len - 8, wth->random_fh); + bytes_read = file_read(pd, pl_hdr.len - 8, wth->random_fh); if(bytes_read != (pl_hdr.len - 8)) { *err = file_error(wth->random_fh); if(*err == 0) @@ -173,8 +173,8 @@ packetlogger_read_header(packetlogger_header_t *pl_hdr, FILE_T fh, int *err) { guint bytes_read = 0; - bytes_read += file_read(&pl_hdr->len, 4, 1, fh); - bytes_read += file_read(&pl_hdr->ts, 8, 1, fh); + bytes_read += file_read(&pl_hdr->len, 4, fh); + bytes_read += file_read(&pl_hdr->ts, 8, fh); /* Convert multi-byte values from big endian to host endian */ pl_hdr->len = GUINT32_FROM_BE(pl_hdr->len); |