diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-10-30 01:58:15 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-10-30 08:58:46 +0000 |
| commit | fdb3ea591bc2d7bb90859eea7cc88a4350de6b6f (patch) | |
| tree | fd747ddd9cb01e157bf18adf6aaeffd8488ee2ba /wiretap | |
| parent | aac8daad57de6bb4c4e7c949953751a238e15cac (diff) | |
Squelch some used-but-not-set warnings (one legitimate, others not).
Also, we don't care how much tagged value data we've read, we just care
whether we've read any or not (EOF reading the first one means "end of
file", EOF reading any of the subsequent ones means "short read").
Change-Id: I2edc54494967b3a88bcc2c79d97eedfded00150d
Reviewed-on: https://code.wireshark.org/review/4993
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/peektagged.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c index 525c44eaa6..1e93860d50 100644 --- a/wiretap/peektagged.c +++ b/wiretap/peektagged.c @@ -486,18 +486,18 @@ peektagged_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info) { peektagged_t *peektagged = (peektagged_t *)wth->priv; - int header_len = 0; + gboolean read_a_tag = FALSE; guint8 tag_value[6]; guint16 tag; gboolean saw_length = FALSE; - guint32 length; - guint32 sliceLength; + guint32 length = 0; + guint32 sliceLength = 0; gboolean saw_timestamp_lower = FALSE; gboolean saw_timestamp_upper = FALSE; peektagged_utime timestamp; guint32 ext_flags = 0; gboolean saw_data_rate_or_mcs_index = FALSE; - guint32 data_rate_or_mcs_index; + guint32 data_rate_or_mcs_index = 0; struct ieee_802_11_phdr ieee_802_11; int skip_len = 0; double t; @@ -514,12 +514,12 @@ peektagged_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, * Short read if we've read something already; * just an EOF if we haven't. */ - if (header_len != 0) + if (read_a_tag) *err = WTAP_ERR_SHORT_READ; } return -1; } - header_len += (int) sizeof(tag_value); + read_a_tag = TRUE; tag = pletoh16(&tag_value[0]); switch (tag) { |