osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Put the FILE_T first in the arguments to parse_dbs_etherwatch_packet(). 

That puts the two arguments to fill in - the wtap_rec and the Buffer -
together.

Change-Id: I8850a7aaccc98e5acd292e3cebc1f37cee8a6ce7
Reviewed-on: https://code.wireshark.org/review/29946
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-09-30 17:57:39 -07:00
parent eaad7ee5aa
commit 92e2858fb1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wiretap/dbs-etherwatch.c
View File

@ -74,7 +74,7 @@ static gboolean dbs_etherwatch_read(wtap *wth, int *err, gchar **err_info,
gint64 *data_offset);
static gboolean dbs_etherwatch_seek_read(wtap *wth, gint64 seek_off,
wtap_rec *rec, Buffer *buf, int *err, gchar **err_info);
static gboolean parse_dbs_etherwatch_packet(wtap_rec *rec, FILE_T fh,
static gboolean parse_dbs_etherwatch_packet(FILE_T fh, wtap_rec *rec,
Buffer* buf, int *err, gchar **err_info);
static guint parse_single_hex_dump_line(char* rec, guint8 *buf,
int byte_offset);
@ -194,7 +194,7 @@ static gboolean dbs_etherwatch_read(wtap *wth, int *err, gchar **err_info,
*data_offset = offset;
/* Parse the packet */
return parse_dbs_etherwatch_packet(&wth->rec, wth->fh,
return parse_dbs_etherwatch_packet(wth->fh, &wth->rec,
wth->rec_data, err, err_info);
}
@ -206,7 +206,7 @@ dbs_etherwatch_seek_read(wtap *wth, gint64 seek_off,
if (file_seek(wth->random_fh, seek_off - 1, SEEK_SET, err) == -1)
return FALSE;
return parse_dbs_etherwatch_packet(rec, wth->random_fh, buf, err,
return parse_dbs_etherwatch_packet(wth->random_fh, rec, buf, err,
err_info);
}
@ -255,7 +255,7 @@ unnumbered. Unnumbered has length 1, numbered 2.
#define CTL_UNNUMB_MASK 0x03
#define CTL_UNNUMB_VALUE 0x03
static gboolean
parse_dbs_etherwatch_packet(wtap_rec *rec, FILE_T fh, Buffer* buf,
parse_dbs_etherwatch_packet(FILE_T fh, wtap_rec *rec, Buffer* buf,
int *err, gchar **err_info)
{
guint8 *pd;