diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index 19ab62713f..2ca9c2498b 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -1038,7 +1038,7 @@ dissect_spoolss_uint16uni(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, remaining = tvb_length_remaining(tvb, offset) / 2; text = tvb_fake_unicode(tvb, offset, remaining, TRUE); - len = strlen(text); + len = (int)strlen(text); proto_tree_add_text(tree, tvb, offset, len * 2, "%s: %s", name ? name : "String", text); @@ -6643,7 +6643,7 @@ dissect_spoolss_printer_enum_values(tvbuff_t *tvb, int offset, subtree, tvb, offset - 4, 4, "Name len: %d", name_len); proto_tree_add_text( - subtree, tvb, start_offset + name_offset, (strlen(name) + 1) * 2, + subtree, tvb, start_offset + name_offset, ((int)strlen(name) + 1) * 2, "Name: %s", name); offset = dissect_ndr_uint32( diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c index ff0553e02a..1555bb94f2 100644 --- a/epan/dissectors/packet-hclnfsd.c +++ b/epan/dissectors/packet-hclnfsd.c @@ -202,7 +202,7 @@ dissect_hclnfsd_authorize_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_ if (ident) { - ident_len = strlen(ident); + ident_len = (int)strlen(ident); proto_item_set_len(ident_item, ident_len); diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index e40f66d439..f3dd56b831 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -408,7 +408,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) auth_buf[sizeof auth_buf - 1] = '\0'; proto_tree_add_string_format(hsrp_tree, hf_hsrp_auth_data, tvb, offset, 8, auth_buf, "Authentication Data: %sDefault (%s)", - (tvb_strneql(tvb, offset, "cisco", strlen("cisco"))) == 0 ? "" : "Non-", + (tvb_strneql(tvb, offset, "cisco", (int)strlen("cisco"))) == 0 ? "" : "Non-", auth_buf); offset += 8; proto_tree_add_item(hsrp_tree, hf_hsrp_virt_ip_addr, tvb, offset, 4, FALSE); @@ -564,7 +564,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) auth_buf[sizeof auth_buf - 1] = '\0'; proto_tree_add_string_format(text_auth_tlv, hf_hsrp2_auth_data, tvb, offset, 8, auth_buf, "Authentication Data: %sDefault (%s)", - (tvb_strneql(tvb, offset, "cisco", strlen("cisco"))) == 0 ? "" : "Non-", + (tvb_strneql(tvb, offset, "cisco", (int)strlen("cisco"))) == 0 ? "" : "Non-", auth_buf); offset += 8; } diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 982c14601e..dff8ce99e3 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -645,8 +645,8 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g /* Display the destination address. */ if(packet->dst.addr16==IEEE802154_BCAST_ADDR) g_snprintf(dst_addr, 32, "Broadcast"); else g_snprintf(dst_addr, 32, "0x%04x", packet->dst.addr16); - SET_ADDRESS(&pinfo->dl_dst, AT_STRINGZ, strlen(dst_addr)+1, dst_addr); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, strlen(dst_addr)+1, dst_addr); + SET_ADDRESS(&pinfo->dl_dst, AT_STRINGZ, (int)strlen(dst_addr)+1, dst_addr); + SET_ADDRESS(&pinfo->dst, AT_STRINGZ, (int)strlen(dst_addr)+1, dst_addr); if (tree) { proto_tree_add_uint(ieee802154_tree, hf_ieee802154_dst_addr16, tvb, offset, sizeof(guint16), packet->dst.addr16); proto_item_append_text(proto_root, ", Dst: %s", dst_addr); @@ -722,8 +722,8 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g /* Update the Address fields. */ if(packet->src.addr16==IEEE802154_BCAST_ADDR) g_snprintf(src_addr, 32, "Broadcast"); else g_snprintf(src_addr, 32, "0x%04x", packet->src.addr16); - SET_ADDRESS(&pinfo->dl_src, AT_STRINGZ, strlen(src_addr)+1, src_addr); - SET_ADDRESS(&pinfo->src, AT_STRINGZ, strlen(src_addr)+1, src_addr); + SET_ADDRESS(&pinfo->dl_src, AT_STRINGZ, (int)strlen(src_addr)+1, src_addr); + SET_ADDRESS(&pinfo->src, AT_STRINGZ, (int)strlen(src_addr)+1, src_addr); /* Add the addressing info to the tree. */ if (tree) { diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c index e4cd212f87..c3be742236 100644 --- a/epan/dissectors/packet-lwres.c +++ b/epan/dissectors/packet-lwres.c @@ -382,7 +382,7 @@ static void dissect_getnamebyaddr_request(tvbuff_t* tvb, proto_tree* lwres_tree) family = tvb_get_ntohl(tvb, LWRES_LWPACKET_LENGTH + 4); addrlen = tvb_get_ntohs(tvb, LWRES_LWPACKET_LENGTH + 8); addr = tvb_get_ptr(tvb, LWRES_LWPACKET_LENGTH + 10, 4); - slen = strlen(ip_to_str(addr)); + slen = (int)strlen(ip_to_str(addr)); if(lwres_tree) { @@ -670,7 +670,7 @@ static void dissect_getaddrsbyname_response(tvbuff_t* tvb, proto_tree* lwres_tre family = tvb_get_ntohl(tvb, offset); length = tvb_get_ntohs(tvb, offset + 4); addr = (gchar*)tvb_get_ptr(tvb, offset + 6, 4); - slen = strlen((char*)ip_to_str((guint8*)addr)); + slen = (int)strlen((char*)ip_to_str((guint8*)addr)); addr_item = proto_tree_add_text(adn_resp_tree,tvb, offset, 4+2+4, "Address %s",ip_to_str((guint8*)addr)); addr_tree = proto_item_add_subtree(addr_item, ett_adn_addr); diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index c490f08470..76ec419743 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -1893,7 +1893,7 @@ dissect_mgcp_connectionparams(proto_tree *parent_tree, tvbuff_t *tvb, gint offse for (i = 0; tokens[i] != NULL; i++) { - tokenlen = strlen(tokens[i]); + tokenlen = (int)strlen(tokens[i]); typval = ep_strsplit(tokens[i], "=", 2); if ((typval[0] != NULL) && (typval[1] != NULL)) { @@ -2007,7 +2007,7 @@ dissect_mgcp_localconnectionoptions(proto_tree *parent_tree, tvbuff_t *tvb, gint hf_uint = -1; hf_string = -1; - tokenlen = strlen(tokens[i]); + tokenlen = (int)strlen(tokens[i]); typval = ep_strsplit(tokens[i], ":", 2); if ((typval[0] != NULL) && (typval[1] != NULL)) { diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c index 65eebf3a76..1dd4f73cf9 100644 --- a/epan/dissectors/packet-mmse.c +++ b/epan/dissectors/packet-mmse.c @@ -1180,7 +1180,7 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut, hf_mmse_prev_sent_by, tvb, offset - 1, 1 + count + length, strval, "%s (Forwarded-count=%u)", - format_text(strval, strlen(strval)), + format_text(strval, (int)strlen(strval)), fwd_count); subtree = proto_item_add_subtree(ti, ett_mmse_hdr_details); @@ -1217,7 +1217,7 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut, hf_mmse_prev_sent_date, tvb, offset - 1, 1 + count + length, strval, "%s (Forwarded-count=%u)", - format_text(strval, strlen(strval)), + format_text(strval, (int)strlen(strval)), fwd_count); subtree = proto_item_add_subtree(ti, ett_mmse_hdr_details); @@ -1256,7 +1256,7 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut, proto_tree_add_text(mmse_tree, tvb, offset - 1, length + 1, "%s: %s (Not decoded)", hdr_name, - format_text(strval, strlen(strval))); + format_text(strval, (int)strlen(strval))); } } else { /* General form with length */ if (peek == 0x1F) { /* Value length in guintvar */ @@ -1292,8 +1292,8 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut, (const char *) tvb_get_ptr( tvb, offset, length + length2), "%s: %s", - format_text(strval, strlen(strval)), - format_text(strval2, strlen(strval2))); + format_text(strval, (int)strlen(strval)), + format_text(strval2, (int)strlen(strval2))); } offset += length + length2; } diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c index 9b2f461720..4e4e9dcf3b 100644 --- a/epan/dissectors/packet-mount.c +++ b/epan/dissectors/packet-mount.c @@ -189,7 +189,7 @@ dissect_mount_dirpath_call(tvbuff_t *tvb, int offset, packet_info *pinfo, ptr+=len; *ptr=0; - nfs_name_snoop_add_name(civ->xid, tvb, -1, strlen(name), 0, 0, name); + nfs_name_snoop_add_name(civ->xid, tvb, -1, (gint)strlen(name), 0, 0, name); } } }