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/iptrace.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/iptrace.c')
| -rw-r--r-- | wiretap/iptrace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c index 960d36eaf4..bab653279a 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -58,7 +58,7 @@ int iptrace_open(wtap *wth, int *err, gchar **err_info _U_) char name[12]; errno = WTAP_ERR_CANT_READ; - bytes_read = file_read(name, 1, 11, wth->fh); + bytes_read = file_read(name, 11, wth->fh); if (bytes_read != 11) { *err = file_error(wth->fh); if (*err != 0) @@ -448,7 +448,7 @@ iptrace_read_rec_header(FILE_T fh, guint8 *header, int header_len, int *err) int bytes_read; errno = WTAP_ERR_CANT_READ; - bytes_read = file_read(header, 1, header_len, fh); + bytes_read = file_read(header, header_len, fh); if (bytes_read != header_len) { *err = file_error(fh); if (*err != 0) @@ -468,7 +468,7 @@ iptrace_read_rec_data(FILE_T fh, guint8 *data_ptr, int packet_size, int *err) int bytes_read; errno = WTAP_ERR_CANT_READ; - bytes_read = file_read( data_ptr, 1, packet_size, fh ); + bytes_read = file_read( data_ptr, packet_size, fh ); if (bytes_read != packet_size) { *err = file_error(fh); |