diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-10-07 12:49:14 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-10-07 19:50:08 +0000 |
| commit | 71550ba98a38508ae90df43bddd0644b2df2f717 (patch) | |
| tree | 32705bb55493a9bbef53a9683d08d5170f71446e /wiretap/network_instruments.c | |
| parent | d98debe6d04e3b2a07c8c9a03ad3a4de54ccbc27 (diff) | |
Make the code a bit more like the pre-new-APIs code.
Change-Id: I40282d8825936d24480c9b77e2e7d9374b1de6b5
Reviewed-on: https://code.wireshark.org/review/4534
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/network_instruments.c')
| -rw-r--r-- | wiretap/network_instruments.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c index 1235cd8dd9..555414253c 100644 --- a/wiretap/network_instruments.c +++ b/wiretap/network_instruments.c @@ -103,9 +103,8 @@ static int read_packet_header(FILE_T fh, union wtap_pseudo_header *pseudo_header static gboolean process_packet_header(wtap *wth, packet_entry_header *packet_header, struct wtap_pkthdr *phdr, int *err, gchar **err_info); -static int read_packet_data(FILE_T fh, int offset_to_frame, - int current_offset_from_packet_header, Buffer *buf, int length, - int *err, char **err_info); +static int read_packet_data(FILE_T fh, int offset_to_frame, int current_offset_from_packet_header, + Buffer *buf, int length, int *err, char **err_info); static gboolean skip_to_next_packet(wtap *wth, int offset_to_next_packet, int current_offset_from_packet_header, int *err, char **err_info); static gboolean observer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, @@ -338,9 +337,9 @@ read_packet_header(FILE_T fh, union wtap_pseudo_header *pseudo_header, /* pull off the packet header */ if (!wtap_read_bytes_or_eof(fh, packet_header, sizeof *packet_header, err, err_info)) { - if (*err == 0) - return 0; /* EOF */ - return -1; + if (*err != 0) + return -1; + return 0; /* EOF */ } offset += (int)sizeof *packet_header; PACKET_ENTRY_HEADER_FROM_LE_IN_PLACE(*packet_header); @@ -498,9 +497,8 @@ process_packet_header(wtap *wth, packet_entry_header *packet_header, } static int -read_packet_data(FILE_T fh, int offset_to_frame, - int current_offset_from_packet_header, Buffer *buf, int length, - int *err, char **err_info) +read_packet_data(FILE_T fh, int offset_to_frame, int current_offset_from_packet_header, Buffer *buf, + int length, int *err, char **err_info) { int seek_increment; int bytes_consumed = 0; @@ -534,8 +532,8 @@ read_packet_data(FILE_T fh, int offset_to_frame, } static gboolean -skip_to_next_packet(wtap *wth, int offset_to_next_packet, - int current_offset_from_packet_header, int *err, char **err_info) +skip_to_next_packet(wtap *wth, int offset_to_next_packet, int current_offset_from_packet_header, int *err, + char **err_info) { int seek_increment; |