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/i4btrace.c | |
| parent | c039f9f8a8bb04d2a8dcd6e2ec1facaee3f1f855 (diff) | |
| download | wireshark-4c93827e34e879111b00873b2cd7c823b6b69f88.tar.gz | |
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/i4btrace.c')
| -rw-r--r-- | wiretap/i4btrace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/i4btrace.c b/wiretap/i4btrace.c index 6c9dc4c619..6b1c7d5013 100644 --- a/wiretap/i4btrace.c +++ b/wiretap/i4btrace.c @@ -65,7 +65,7 @@ int i4btrace_open(wtap *wth, int *err, gchar **err_info _U_) /* I4B trace files have no magic in the header... Sigh */ errno = WTAP_ERR_CANT_READ; - bytes_read = file_read(&hdr, 1, sizeof(hdr), wth->fh); + bytes_read = file_read(&hdr, sizeof(hdr), wth->fh); if (bytes_read != sizeof(hdr)) { *err = file_error(wth->fh); if (*err != 0) @@ -222,7 +222,7 @@ i4b_read_rec_header(FILE_T fh, i4b_trace_hdr_t *hdr, int *err) int bytes_read; errno = WTAP_ERR_CANT_READ; - bytes_read = file_read(hdr, 1, sizeof *hdr, fh); + bytes_read = file_read(hdr, sizeof *hdr, fh); if (bytes_read != sizeof *hdr) { *err = file_error(fh); if (*err != 0) @@ -262,7 +262,7 @@ i4b_read_rec_data(FILE_T fh, guchar *pd, int length, int *err) int bytes_read; errno = WTAP_ERR_CANT_READ; - bytes_read = file_read(pd, 1, length, fh); + bytes_read = file_read(pd, length, fh); if (bytes_read != length) { *err = file_error(fh); |