osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Guy Harris 2012-12-21 02:30:35 +00:00
parent bb674a2e1e
commit 9bfcd83721
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wiretap/btsnoop.c
View File

@ -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;
}