diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-05-01 02:47:52 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-05-01 02:47:52 +0000 |
| commit | 73f3d2399936775fd05383bc9c5182f1e68dd733 (patch) | |
| tree | dffbb48954ecfc430f4eac847a0d1ad94ec29658 /wiretap | |
| parent | 3523b34d6588a9ef97d8988bf88508f56399a7ed (diff) | |
Fix 2 redundant redeclaration warnings and a bug where logical AND (&&) was incorrectly used where bit-wise AND (&) was meant.
svn path=/trunk/; revision=42373
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/vwr.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/wiretap/vwr.c b/wiretap/vwr.c index a6b80db864..f3e98cf183 100644 --- a/wiretap/vwr.c +++ b/wiretap/vwr.c @@ -35,9 +35,6 @@ /* platform-specific definitions for portability */ -static int find_signature(register guint8*, int, register guint32, - register guint8); -static guint64 get_signature_ts(register guint8*, int); /* unsigned long long constants */ # define NS_IN_US G_GINT64_CONSTANT(1000U) /* nanoseconds-to-microseconds */ @@ -1346,7 +1343,7 @@ static void vwr_read_rec_data_vVW510021(wtap *wth, guint8 *data_ptr, guint8 *rec errors = pntohl(&s_trail_ptr[vwr->ERRORS_OFF]); info = pntohs(&s_trail_ptr[vwr->INFO_OFF]); - if ((info && 0xFC00) != 0) + if ((info & 0xFC00) != 0) /* this length includes the Start_Spacing + Delimiter + MPDU + Padding for each piece of the aggregate*/ ht_len = pletohs(&s_start_ptr[vwr->PLCP_LENGTH_OFF]); |