diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2020-07-06 15:29:02 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-07-06 14:36:11 +0000 |
| commit | 9c5b15a8f471dfa7388d9eed4cd5ea7b2c2d9be4 (patch) | |
| tree | bcb25e0227c9100c12bc4c67f641cc140f454be2 | |
| parent | 9fc054a65bfadf40325bb4f5185c7247ed4a9a6c (diff) | |
SDP: Try to fix -Wpointer-sign warnings.
Change-Id: Ia08bec34b64374fcad8c746274720e1a3ccd2689
Reviewed-on: https://code.wireshark.org/review/37739
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-sdp.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index a891468fcf..3af4c44798 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -494,7 +494,7 @@ parse_sdp_media_protocol(const char *media_proto) /* Parses the parts from "c=" into address structures. */ static void -parse_sdp_connection_address(const char *connection_type, const char *connection_address, +parse_sdp_connection_address(const guint8 *connection_type, const char *connection_address, wmem_allocator_t *allocator, address *conn_addr) { if (strcmp(connection_type, "IP4") == 0) { @@ -672,12 +672,11 @@ dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti, session_info_t *sessi if (next_offset == -1) { tokenlen = -1; /* end of tvbuff */ /* Save connection address */ - connection_address = - (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tvb_captured_length_remaining(tvb, offset), ENC_UTF_8|ENC_NA); + connection_address = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tvb_captured_length_remaining(tvb, offset), ENC_UTF_8|ENC_NA); } else { tokenlen = next_offset - offset; /* Save connection address */ - connection_address = (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tokenlen, ENC_UTF_8|ENC_NA); + connection_address = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tokenlen, ENC_UTF_8|ENC_NA); } DPRINT(("parsed connection line address=%s", connection_address)); @@ -902,13 +901,13 @@ static void dissect_key_mgmt(tvbuff_t *tvb, packet_info * pinfo, proto_item * ti if (len < 0) return; - data_p = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_UTF_8|ENC_NA); + data_p = (gchar *)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_UTF_8|ENC_NA); keymgmt_tvb = base64_to_tvb(tvb, data_p); add_new_data_source(pinfo, keymgmt_tvb, "Key Management Data"); if ((prtcl_id != NULL) && (key_mgmt_dissector_table != NULL)) { found_match = dissector_try_string(key_mgmt_dissector_table, - prtcl_id, + (const gchar *)prtcl_id, keymgmt_tvb, pinfo, key_tree, NULL); } @@ -1019,9 +1018,9 @@ dissect_sdp_media(tvbuff_t *tvb, packet_info* pinfo, proto_item *ti, ENC_UTF_8|ENC_NA, wmem_packet_scope(), &media_type_str); if (media_desc) { /* for RTP statistics (supposedly?) */ - if (strcmp(media_type_str, "audio") == 0) + if (strcmp((const char*)media_type_str, "audio") == 0) media_desc->media_types |= RTP_MEDIA_AUDIO; - else if (strcmp(media_type_str, "video") == 0) + else if (strcmp((const char*)media_type_str, "video") == 0) media_desc->media_types |= RTP_MEDIA_VIDEO; else media_desc->media_types |= RTP_MEDIA_OTHER; |