diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-12-21 02:30:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-12-21 02:30:35 +0000 |
| commit | 9bfcd83721876d337580e8fdc26d18cd8d317093 (patch) | |
| tree | d9364513b5d21d5735415e0f274e5b0f16696602 /wiretap/btsnoop.c | |
| parent | bb674a2e1e639831684ddde471baf7273b858965 (diff) | |
Squelch 64-bit-to-32-bit implicit conversion warning; the warning
appears to be bogus - even if I put "(gint64) phdr->ts.nsecs" in an
extra layer of parentheses, i.e.
(((gint64) phdr->ts.nsecs) / 1000)
I still get the warning from
i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple
Inc. build 5658) (LLVM build 2336.11.00)
svn path=/trunk/; revision=46649
Diffstat (limited to 'wiretap/btsnoop.c')
| -rw-r--r-- | wiretap/btsnoop.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c index 4b7820dd4a..baa8812214 100644 --- a/wiretap/btsnoop.c +++ b/wiretap/btsnoop.c @@ -355,6 +355,7 @@ static gboolean btsnoop_dump_partial_rec_hdr(wtap_dumper *wdh _U_, struct btsnooprec_hdr *rec_hdr) { gint64 ts_usec; + gint64 nsecs; guint8 flags = 0; if (!btsnoop_lookup_flags(*pd, pseudo_header->p2p.sent, &flags)) { @@ -362,7 +363,8 @@ static gboolean btsnoop_dump_partial_rec_hdr(wtap_dumper *wdh _U_, return FALSE; } - ts_usec = ((gint64) phdr->ts.secs * 1000000) + ((gint64) phdr->ts.nsecs / 1000); + nsecs = phdr->ts.nsecs; + ts_usec = ((gint64) phdr->ts.secs * 1000000) + (nsecs / 1000); ts_usec += KUnixTimeBase; rec_hdr->flags = GUINT32_TO_BE(flags); @@ -510,4 +512,3 @@ gboolean btsnoop_dump_open_h4(wtap_dumper *wdh, int *err) return TRUE; } - |