diff options
author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-03-29 13:47:15 +0000 |
---|---|---|
committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-03-29 13:47:15 +0000 |
commit | b856f2f5d8cecdf87deb61b8661d1cd12a9b79f2 (patch) | |
tree | 2c37e5c2a5b1c7bed5fe5ee704e0980c1399b1b2 /epan | |
parent | 87d0fb9730a5ba0deac667790573c007ad66f491 (diff) |
More size_t casts.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27880 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-bootp.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-cdp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-cimd.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-dcm.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-extreme.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-sdp.c | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index 5f8528df3c..ed7129fad3 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -1166,19 +1166,19 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff, proto_item_append_text(vti, " = \"%s\"", tvb_format_stringzpad(tvb, optoff, consumed-2)); if ((tvb_memeql(tvb, optoff, (const guint8*)PACKETCABLE_MTA_CAP10, - strlen(PACKETCABLE_MTA_CAP10)) == 0) + (int)strlen(PACKETCABLE_MTA_CAP10)) == 0) || (tvb_memeql(tvb, optoff, (const guint8*)PACKETCABLE_MTA_CAP15, - strlen(PACKETCABLE_MTA_CAP10)) == 0)) + (int)strlen(PACKETCABLE_MTA_CAP10)) == 0)) { dissect_packetcable_mta_cap(v_tree, tvb, optoff, optlen); } else { if (tvb_memeql(tvb, optoff, (const guint8*)PACKETCABLE_CM_CAP11, - strlen(PACKETCABLE_CM_CAP11)) == 0 + (int)strlen(PACKETCABLE_CM_CAP11)) == 0 || tvb_memeql(tvb, optoff, (const guint8*)PACKETCABLE_CM_CAP20, - strlen(PACKETCABLE_CM_CAP20)) == 0 ) + (int)strlen(PACKETCABLE_CM_CAP20)) == 0 ) { dissect_docsis_cm_cap(v_tree, tvb, optoff, optlen); } diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index 2d65f97b59..8c5d783b2d 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -1237,7 +1237,7 @@ add_multi_line_string_to_tree(proto_tree *tree, tvbuff_t *tvb, gint start, int line_len; int data_len; - prefix_len = strlen(prefix); + prefix_len = (int)strlen(prefix); if (prefix_len > 64) prefix_len = 64; for (i = 0; i < prefix_len; i++) diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c index 73506f84a1..a8150dd807 100644 --- a/epan/dissectors/packet-cimd.c +++ b/epan/dissectors/packet-cimd.c @@ -311,7 +311,7 @@ static void dissect_cimd_ud(tvbuff_t *tvb, proto_tree *tree, gint pindex, gint s g_size = endOffset - g_offset; payloadText = tvb_format_text(tvb, g_offset, g_size); - size = strlen(payloadText); + size = (int)strlen(payloadText); for (loop = 0; loop < size; loop++) { if (payloadText[loop] == '_') @@ -356,7 +356,7 @@ static void dissect_cimd_ud(tvbuff_t *tvb, proto_tree *tree, gint pindex, gint s } tmpBuffer[bufPoz] = '\0'; - size1 = strlen(tmpBuffer); + size1 = (int)strlen(tmpBuffer); for (loop=0; loop<size1;loop++) { ch = tmpBuffer[loop]; diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 18f49b843b..d18e9d6326 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -4265,7 +4265,7 @@ dcm_export_create_tag_str(guint8 *buffer, guint32 bufflen, guint32 offset, return offset; } - len=strlen(value); + len=(int)strlen(value); if ((len & 0x01) == 1) { /* Odd length: since buffer is 0 initalized, pad with a 0x00 */ diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 87fe2572bb..1b9da0a433 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -429,7 +429,7 @@ dissect_display_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, p display_name = tvb_get_ephemeral_string(tvb, offset, length); proto_item_append_text(display_item, ": \"%s\"", - format_text(display_name, strlen(display_name))); + format_text(display_name, (int)strlen(display_name))); proto_tree_add_string(display_tree, hf_edp_display_string, tvb, offset, length, display_name); } @@ -620,7 +620,7 @@ dissect_vlan_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot vlan_name = tvb_get_ephemeral_string(tvb, offset, length); proto_item_append_text(vlan_item, ", Name \"%s\"", - format_text(vlan_name, strlen(vlan_name))); + format_text(vlan_name, (int)strlen(vlan_name))); proto_tree_add_string(vlan_tree, hf_edp_vlan_name, tvb, offset, length, vlan_name); offset += length; diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index b83f93a5f8..92c2b3c663 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -1636,7 +1636,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto int address_offset, port_offset, port_end_offset; /* Address starts here */ - address_offset = offset + strlen(msrp_res); + address_offset = offset + (int)strlen(msrp_res); /* Port is after next ':' */ port_offset = tvb_find_guint8(tvb, address_offset, -1, ':'); @@ -1665,7 +1665,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto gint len; asn1_ctx_t actx; - len = strlen(attribute_value); + len = (gint)strlen(attribute_value); h245_tvb = ascii_bytes_to_tvb(tvb, pinfo, len, attribute_value); /* arbitrary maximum length */ /* should go through a handle, however, the two h245 entry |