diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-10-10 11:40:08 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-10-10 18:41:00 +0000 |
| commit | 685d3034d5aafc73a0760076ed7ab78b48554534 (patch) | |
| tree | 269c410181d1d613ce7a94d6ea41f2bcc3fbf2ef /wiretap/netscaler.c | |
| parent | 6463d2a7e66e259dabbeffbab67bcbeedd98133f (diff) | |
Version 3 has only absolute timestamps; don't set nsg_creltime.
Version 3's time stamps are all absolute, so we can directly use the
value in the file; we don't need to keep track of the time in the
private data structure, and some compilers issue warnings due to setting
it and then not using the value to which we set it.
Change some names and indentation to match other file versions while
we're at it.
Change-Id: I97698d933b87a8ad58d9e88ceedd75004797df69
Reviewed-on: https://code.wireshark.org/review/4596
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/netscaler.c')
| -rw-r--r-- | wiretap/netscaler.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c index 60d1427c65..e5a80836a6 100644 --- a/wiretap/netscaler.c +++ b/wiretap/netscaler.c @@ -1270,7 +1270,7 @@ static gboolean nstrace_read_v20(wtap *wth, int *err, gchar **err_info, gint64 * static gboolean nstrace_read_v30(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { nstrace_t *nstrace = (nstrace_t *)wth->priv; - guint64 nsg_creltime = nstrace->nsg_creltime; + guint64 nsg_creltime; gchar *nstrace_buf = nstrace->pnstrace_buf; gint32 nstrace_buf_offset = nstrace->nstrace_buf_offset; gint32 nstrace_buflen = nstrace->nstrace_buflen; @@ -1290,14 +1290,16 @@ static gboolean nstrace_read_v30(wtap *wth, int *err, gchar **err_info, gint64 * switch (hdp->phd_RecordType) { -#define GENERATE_CASE_V30(phdr,type,acttype) \ +#define GENERATE_CASE_FULL_V30(phdr,type,acttype) \ case NSPR_PDPKTRACEFULLTX_V##type:\ case NSPR_PDPKTRACEFULLTXB_V##type:\ case NSPR_PDPKTRACEFULLRX_V##type:\ case NSPR_PDPKTRACEFULLNEWRX_V##type:\ - PACKET_DESCRIBE(phdr, TIMEDEF, FPSIZEDEFV,type,v##type##_full,fp,pktracefull_v##type,acttype); - GENERATE_CASE_V30(&wth->phdr,30, 300); -#undef GENERATE_CASE_V30 + PACKET_DESCRIBE(phdr,TIMEDEF,FPSIZEDEFV,type,v##type##_full,fp,pktracefull_v##type,acttype); + + GENERATE_CASE_FULL_V30(&wth->phdr,30,300); + +#undef GENERATE_CASE_FULL_V30 case NSPR_ABSTIME_V20: { |