diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-11-04 11:25:40 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-11-04 11:25:40 +0000 |
| commit | 4a69d9203d590cdd9ffdfb06fa716224cfae286b (patch) | |
| tree | d04593c360c307481d99bb66f7e2f30e1562f5b7 | |
| parent | c1b8394ebc3b7056fb13267629dc784b0c225a81 (diff) | |
Corrected pointer types to avoid warnings from clang.
svn path=/trunk/; revision=34773
| -rw-r--r-- | epan/dissectors/packet-clnp.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-dtn.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ftp.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index 35a2e57c2f..bd9db552d1 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -493,7 +493,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) XXX - if this isn't the first Derived PDU of a segmented Initial PDU, skip that? */ - if (nsel == (char)tp_nsap_selector || always_decode_transport) { + if (nsel == (guchar)tp_nsap_selector || always_decode_transport) { if (call_dissector(ositp_handle, next_tvb, pinfo, tree) != 0) { pinfo->fragmented = save_fragmented; return; /* yes, it appears to be COTP or CLTP */ diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index 0073da9214..2f7522dfab 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -404,7 +404,7 @@ dissect_tcp_bundle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "TCP Convergence Header"); conv_tree = proto_item_add_subtree(conv_item, ett_tcp_conv_hdr); - if(conv_hdr == magic[0]) { + if(conv_hdr == (guint8)magic[0]) { sptr = (char *) tvb_get_ephemeral_string(tvb, frame_offset, 4); if(!memcmp(sptr, magic, 4)){ dissect_contact_header(tvb, pinfo, conv_tree, conv_item); diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index 33d79bf7d8..2994865d6e 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -259,7 +259,7 @@ parse_extended_pasv_response(const guchar *line, int linelen, guint16 *ftp_port) (Try to cope with '(' in description) */ for (; !delimiters_seen;) { - char delimiter = '\0'; + guchar delimiter = '\0'; while ((c = *p) != '\0' && (c != '(')) p++; |