diff options
| author | Evan Huus <eapache@gmail.com> | 2014-07-23 13:41:54 -0400 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-07-23 17:44:24 +0000 |
| commit | ae64e0951166d2d903736e988bab611e11196b84 (patch) | |
| tree | df7c028a4218a0eb2ee881a6977824fbf1ed3958 /wiretap/logcat.c | |
| parent | 057ded827d36f55b8f91e9de888fd14e3b73d8c2 (diff) | |
| download | wireshark-ae64e0951166d2d903736e988bab611e11196b84.tar.gz | |
Add cast to satisfy win7 buildbot
I really don't understand why MSVC would make the result of this computation an
int64 then complain about down-casting to an int16 when *all* of the
participating variables are int16 or smaller...
Change-Id: I2d9c27ac22b51b10e4872a6640881c8d0ec566e7
Reviewed-on: https://code.wireshark.org/review/3180
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'wiretap/logcat.c')
| -rw-r--r-- | wiretap/logcat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/logcat.c b/wiretap/logcat.c index 6b148b8328..53fb2fec01 100644 --- a/wiretap/logcat.c +++ b/wiretap/logcat.c @@ -272,7 +272,7 @@ static gint buffered_detect_version(const guint8 *pd) /* if msg is '\0'-terminated, is it equal to the payload len? */ ++msg_part; - msg_len = log_entry->len - (msg_part - msg_payload); + msg_len = (guint16)(log_entry->len - (msg_part - msg_payload)); msg_end = (guint8 *) memchr(msg_part, '\0', msg_len); /* is the end of the buffer (-1) equal to the end of msg? */ if (msg_end && (msg_payload + log_entry->len - 1 != msg_end)) |