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/libpcap.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/libpcap.c')
-rw-r--r-- | wiretap/libpcap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 484a79d5e7..03ffed19b7 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -93,7 +93,7 @@ int libpcap_open(wtap *wth, int *err, gchar **err_info) /* Read in the number that should be at the start of a "libpcap" file */ errno = WTAP_ERR_CANT_READ; - bytes_read = file_read(&magic, 1, sizeof magic, wth->fh); + bytes_read = file_read(&magic, sizeof magic, wth->fh); if (bytes_read != sizeof magic) { *err = file_error(wth->fh); if (*err != 0) @@ -164,7 +164,7 @@ int libpcap_open(wtap *wth, int *err, gchar **err_info) /* Read the rest of the header. */ 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) @@ -787,7 +787,7 @@ static int libpcap_read_header(wtap *wth, int *err, gchar **err_info, g_assert_not_reached(); bytes_to_read = 0; } - bytes_read = file_read(hdr, 1, bytes_to_read, wth->fh); + bytes_read = file_read(hdr, bytes_to_read, wth->fh); if (bytes_read != bytes_to_read) { *err = file_error(wth->fh); if (*err == 0 && bytes_read != 0) { @@ -880,7 +880,7 @@ libpcap_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); |