osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Use tvb_bytes_to_str() instead of a homegrown version. 

svn path=/trunk/; revision=37321
This commit is contained in:
Jeff Morriss 2011-05-20 03:17:01 +00:00
parent 2a86281027
commit 947e2c78c8
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
epan/dissectors/packet-umts_fp.c
View File

@ -2822,28 +2822,15 @@ static void dissect_e_dch_t2_or_common_channel_info(tvbuff_t *tvb, packet_info *
/* MAC-is SDUs (i.e. MACd PDUs) */
for (sdu_no=0; sdu_no < subframes[n].number_of_mac_is_sdus[pdu_no]; sdu_no++) {
const guint8 *pdu_data;
int i;
char buff[64];
ti = proto_tree_add_item(macis_pdu_tree, hf_fp_edch_macis_sdu, tvb,
offset,
subframes[n].mac_is_length[pdu_no][sdu_no],
FALSE);
proto_item_append_text(ti, " (%s Len=%u): ",
proto_item_append_text(ti, " (%s Len=%u): %s",
val_to_str_const(subframes[n].mac_is_lchid[pdu_no][sdu_no], lchid_vals, "Unknown"),
subframes[n].mac_is_length[pdu_no][sdu_no]);
/* Show bytes too. There must be a nicer way of doing this! */
pdu_data = tvb_get_ptr(tvb, offset, subframes[n].mac_is_length[pdu_no][sdu_no]);
for (i=0; i < subframes[n].mac_is_length[pdu_no][sdu_no]; i++) {
g_snprintf(buff+(i*2), 3, "%02x", pdu_data[i]);
if (i >= 30) {
g_snprintf(buff+(i*2), 4, "...");
break;
}
}
proto_item_append_text(ti, "%s", buff);
subframes[n].mac_is_length[pdu_no][sdu_no],
tvb_bytes_to_str(tvb, offset, subframes[n].mac_is_length[pdu_no][sdu_no]));
offset += subframes[n].mac_is_length[pdu_no][sdu_no];
subframe_bytes += subframes[n].mac_is_length[pdu_no][sdu_no];