diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 17:57:31 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 17:57:31 +0000 |
| commit | 083729e02c44e41943f44dc7efd3bacd75ee62a4 (patch) | |
| tree | 250d8074cd60db9a6f6cc1d12ed9ff6d797c859f /plugins | |
| parent | 3512e485ca7cbea07c193f87f029cf5f6959d864 (diff) | |
Add PTREE_FINFO and use PITEM_FINFO when possible.
svn path=/trunk/; revision=29355
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/wimax/packet-wmx.c | 10 | ||||
| -rw-r--r-- | plugins/wimax/wimax_harq_map_decoder.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/wimax/packet-wmx.c b/plugins/wimax/packet-wmx.c index 9866c8ec41..5d2f1e9a68 100644 --- a/plugins/wimax/packet-wmx.c +++ b/plugins/wimax/packet-wmx.c @@ -643,8 +643,8 @@ proto_tree *add_tlv_subtree(tlv_info_t *this, gint idx, proto_tree *tree, int hf /* display the TLV name and display the value in hex. Highlight type, length, and value. */ tlv_item = proto_tree_add_item(tree, hfindex, tvb, start, tlv_value_length, little_endian); /* Correct the highlighting. */ - tlv_item->finfo->start -= tlv_val_offset; - tlv_item->finfo->length += tlv_val_offset; + PITEM_FINFO(tlv_item)->start -= tlv_val_offset; + PITEM_FINFO(tlv_item)->length += tlv_val_offset; /* add TLV subtree to contain the type, length, and value */ tlv_tree = proto_item_add_subtree(tlv_item, *ett_tlv[tlv_type]); /* display the TLV type */ @@ -685,7 +685,7 @@ proto_tree *add_tlv_subtree(tlv_info_t *this, gint idx, proto_tree *tree, int hf break; } /* Show "TLV value: " */ - tlv_item = proto_tree_add_text(tlv_tree, tvb, start, tlv_value_length, hex_fmt, tlv_item->finfo->hfinfo->name, tlv_value); + tlv_item = proto_tree_add_text(tlv_tree, tvb, start, tlv_value_length, hex_fmt, PITEM_FINFO(tlv_item)->hfinfo->name, tlv_value); tlv_tree = proto_item_add_subtree(tlv_item, idx); /* Return a pointer to the value level */ @@ -734,8 +734,8 @@ proto_tree *add_protocol_subtree(tlv_info_t *this, gint idx, proto_tree *tree, i va_end(ap); tlv_item = proto_tree_add_protocol_format(tree, hfindex, tvb, start, length, "%s", message); /* Correct the highlighting. */ - tlv_item->finfo->start -= tlv_val_offset; - tlv_item->finfo->length += tlv_val_offset; + PITEM_FINFO(tlv_item)->start -= tlv_val_offset; + PITEM_FINFO(tlv_item)->length += tlv_val_offset; /* add TLV subtree to contain the type, length, and value */ tlv_tree = proto_item_add_subtree(tlv_item, *ett_tlv[tlv_type]); /* display the TLV type */ diff --git a/plugins/wimax/wimax_harq_map_decoder.c b/plugins/wimax/wimax_harq_map_decoder.c index 75e5c29d6c..cde0c368a1 100644 --- a/plugins/wimax/wimax_harq_map_decoder.c +++ b/plugins/wimax/wimax_harq_map_decoder.c @@ -124,7 +124,7 @@ void dissector_wimax_harq_map_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t dl_ie_count = ((first_24bits & WIMAX_HARQ_MAP_DL_IE_COUNT_MASK) >> WIMAX_HARQ_MAP_DL_IE_COUNT_SHIFT); /* get the UL MAP appended */ ulmap_appended = (first_24bits & WIMAX_HARQ_UL_MAP_APPENDED_MASK); - if (parent_item == NULL || parent_item->finfo == NULL) + if (parent_item == NULL || PITEM_FINFO(parent_item) == NULL) { parent_item = harq_map_item; /* Prevent crash */ } |