osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Make sure *err and *err_info are set when returning PCAPNG_BLOCK_NOT_SHB. 

Clean up a comment and indentation while we're at it.

Change-Id: Ia2b0a3f642849dcd464e04cdca13ff05c2fbe2e6
Reviewed-on: https://code.wireshark.org/review/4717
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-10-15 18:15:15 -07:00
parent 9cfab55200
commit df8389559f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wiretap/pcapng.c
View File

@ -491,9 +491,9 @@ pcapng_free_wtapng_block_data(wtapng_block_t *wblock)
}
typedef enum {
PCAPNG_BLOCK_OK,
PCAPNG_BLOCK_NOT_SHB,
PCAPNG_BLOCK_ERROR
PCAPNG_BLOCK_OK,
PCAPNG_BLOCK_NOT_SHB,
PCAPNG_BLOCK_ERROR
} block_return_val;
static block_return_val
@ -2082,9 +2082,11 @@ pcapng_read_block(wtap *wth, FILE_T fh, pcapng_t *pn, wtapng_block_t *wblock, in
if (!pn->shb_read) {
/*
* No SHB seen yet, so we're trying to read the first block
* during an open; if what we read isn't an SHB, this isn't
* a pcap-ng file.
* during an open, to see whether it's an SHB; if what we
* read doesn't look like an SHB, this isn't a pcap-ng file.
*/
*err = 0;
*err_info = NULL;
return PCAPNG_BLOCK_NOT_SHB;
}
switch (bh.block_type) {