diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2014-07-11 22:30:25 +0100 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2014-07-11 21:37:51 +0000 |
| commit | 804409747357071631867ccbabc16a5575f5f364 (patch) | |
| tree | e1f36f60fa0a3bdda963ffa50721cafa735fdb94 /wiretap/logcat.c | |
| parent | e2038e03007faaa29f9ed1cb3619e84bd6e03247 (diff) | |
Fix the x64 builds after the commit:b3b1f7c3aa2233a147294bad833b748d38fba84d
From Change: 2803
Change-Id: Ic57fb0e3c1e0450561aebe48a873a3fdb2e8e105
Reviewed-on: https://code.wireshark.org/review/3014
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'wiretap/logcat.c')
| -rw-r--r-- | wiretap/logcat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/logcat.c b/wiretap/logcat.c index 2cc31e9864..cd4cb386c9 100644 --- a/wiretap/logcat.c +++ b/wiretap/logcat.c @@ -215,7 +215,7 @@ static gint detect_version(wtap *wth, int *err, gchar **err_info) /* if msg is '\0'-terminated, is it equal to the payload len? */ ++msg_part; - msg_len = payload_length - (msg_part - msg_payload); + msg_len = (guint16)(payload_length - (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 + payload_length - 1 != msg_end)) @@ -249,9 +249,9 @@ static gboolean logcat_read_packet(struct logcat_phdr *logcat, FILE_T fh, payload_length = pletoh16(tmp); if (logcat->version == 1) { - packet_size = sizeof(struct logger_entry) + payload_length; + packet_size = (gint)sizeof(struct logger_entry) + payload_length; } else if (logcat->version == 2) { - packet_size = sizeof(struct logger_entry_v2) + payload_length; + packet_size = (gint)sizeof(struct logger_entry_v2) + payload_length; } else { return FALSE; } |