diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2015-02-19 15:21:34 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-02-19 14:23:03 +0000 |
| commit | ca68a7adc306dcd177d731766833a0369768027a (patch) | |
| tree | 76ed9c597f6b8deefcf995d3ac8f12c3855fdaa5 /epan | |
| parent | adf6f895689dc334d1ee3c4d69ff39b77ff7174f (diff) | |
| download | wireshark-ca68a7adc306dcd177d731766833a0369768027a.tar.gz | |
Add some casts to satisfy the various compilers.
Change-Id: I7687fc0b433774fe447757af00bdaa2fc44ac59d
Reviewed-on: https://code.wireshark.org/review/7254
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/address_types.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-j1939.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-sna.c | 2 | ||||
| -rw-r--r-- | epan/osi-utils.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/epan/address_types.c b/epan/address_types.c index f04ef53e35..c88edc894f 100644 --- a/epan/address_types.c +++ b/epan/address_types.c @@ -969,7 +969,7 @@ static void address_with_resolution_to_str_buf(const address* addr, gchar *buf, buf[pos++] = '('; } - addr_len = at->addr_to_str(addr, &buf[pos], buf_len-pos); + addr_len = at->addr_to_str(addr, &buf[pos], (int)(buf_len-pos)); pos += addr_len; if (!empty) diff --git a/epan/dissectors/packet-j1939.c b/epan/dissectors/packet-j1939.c index 66d4493c20..c2e901f5f1 100644 --- a/epan/dissectors/packet-j1939.c +++ b/epan/dissectors/packet-j1939.c @@ -266,7 +266,7 @@ static int J1939_addr_to_str(const address* addr, gchar *buf, int buf_len _U_) buf = uint_to_str_back(buf, *addrdata); *buf = '\0'; - return buf-start_buf+1; + return (int)(buf-start_buf+1); } static int J1939_addr_str_len(const address* addr _U_) diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index cfa5bd2e09..bfda7bef4e 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -862,7 +862,7 @@ static int sna_fid_to_str_buf(const address *addr, gchar *buf, int buf_len _U_) return 1; } - return strlen(buf)+1; + return (int)strlen(buf)+1; } diff --git a/epan/osi-utils.c b/epan/osi-utils.c index 073c43ba35..48fe369f68 100644 --- a/epan/osi-utils.c +++ b/epan/osi-utils.c @@ -223,7 +223,7 @@ static int osi_address_type = -1; static int osi_address_to_str(const address* addr, gchar *buf, int buf_len) { print_nsap_net_buf((const guint8 *)addr->data, addr->len, buf, buf_len); - return strlen(buf)+1; + return (int)strlen(buf)+1; } static int osi_address_str_len(const address* addr _U_) |