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/tnef.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/tnef.c')
| -rw-r--r-- | wiretap/tnef.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/tnef.c b/wiretap/tnef.c index 9ad0586d58..b0aebb0fe6 100644 --- a/wiretap/tnef.c +++ b/wiretap/tnef.c @@ -111,7 +111,7 @@ int tnef_open(wtap *wth, int *err, gchar **err_info _U_) int bytes_read; guint32 magic; - 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); return (*err != 0) ? -1 : 0; |