aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-09-30 17:57:39 -0700
committerGuy Harris <guy@alum.mit.edu>2018-10-01 00:58:11 +0000
commit92e2858fb1199ff7c9d150fa8d4020bd4a1b831f (patch)
tree0ead632c8d1449a1bd6650f07694c24c68560589
parenteaad7ee5aaffc81835bb615cb4693b1b5e22c759 (diff)
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>
-rw-r--r--wiretap/dbs-etherwatch.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/dbs-etherwatch.c b/wiretap/dbs-etherwatch.c
index bca6bfa8cc..010747e0d1 100644
--- a/wiretap/dbs-etherwatch.c
+++ b/wiretap/dbs-etherwatch.c
@@ -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;