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/airopeek9.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/airopeek9.c')
| -rw-r--r-- | wiretap/airopeek9.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/airopeek9.c b/wiretap/airopeek9.c index a116ecf8e1..f01ae32430 100644 --- a/wiretap/airopeek9.c +++ b/wiretap/airopeek9.c @@ -365,7 +365,7 @@ airopeekv9_process_header(FILE_T fh, hdr_info_t *hdr_info, int *err, do { /* Get the tag and value. XXX - this assumes all values are 4 bytes long. */ - bytes_read = file_read(tag_value, 1, sizeof tag_value, fh); + bytes_read = file_read(tag_value, sizeof tag_value, fh); if (bytes_read != (int) sizeof tag_value) { *err = file_error(fh); if (*err == 0) { |