diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-04-18 20:03:32 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-04-18 20:03:32 +0000 |
| commit | 7f06b2e2174a55f5968962836d9c4dbcdd5cba2a (patch) | |
| tree | 47cf7af07f73b4da52543ad11c9203076465f737 /wiretap/k12.c | |
| parent | 0dd99df7ce353f77c532d52df285ca6737e3cf96 (diff) | |
Wrap actual_len inside #ifdef DEBUG_K12 to avoid gcc 4.6.0 warning reported by
Kaul: http://www.wireshark.org/lists/wireshark-dev/201104/msg00170.html
svn path=/trunk/; revision=36710
Diffstat (limited to 'wiretap/k12.c')
| -rw-r--r-- | wiretap/k12.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/wiretap/k12.c b/wiretap/k12.c index 300f92fbb2..fda91d1743 100644 --- a/wiretap/k12.c +++ b/wiretap/k12.c @@ -272,9 +272,12 @@ static gint get_record(guint8** bufferp, FILE_T fh, gint64 file_offset, static guint buffer_len = 0x2000 ; guint bytes_read; guint last_read; - guint actual_len, left; + guint left; guint8 junk[0x14]; guint8* writep; +#ifdef DEBUG_K12 + guint actual_len; +#endif /* where the next unknown 0x10 bytes are stuffed to the file */ guint junky_offset = 0x2000 - (gint) ( (file_offset - 0x200) % 0x2000 ); @@ -323,7 +326,10 @@ static gint get_record(guint8** bufferp, FILE_T fh, gint64 file_offset, } } - actual_len = left = pntohl(buffer); + left = pntohl(buffer); +#ifdef DEBUG_K12 + actual_len = left; +#endif junky_offset -= 0x4; K12_DBG(5,("get_record: GET length=%u",left)); |