diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-10-24 23:59:47 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-10-24 23:59:47 +0000 |
| commit | 9563de93a3315ec93e39f186c52b7122f74ae407 (patch) | |
| tree | ea43b5d9a03b8a8d6272f95b007c2923be212222 /epan/dissectors/packet-aim.c | |
| parent | 8a707b0af50c806c0c835c0241c1acbef3c1c2fe (diff) | |
AIM doesn't ever use it's private_data structure, so remove it. If it ever does, just pass the data into the subdissectors.
svn path=/trunk/; revision=52830
Diffstat (limited to 'epan/dissectors/packet-aim.c')
| -rw-r--r-- | epan/dissectors/packet-aim.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index 963108208e..6aaf764636 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -675,14 +675,12 @@ dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, int offset, guint16 flags; guint32 id; proto_item *ti1; - struct aiminfo aiminfo; proto_tree *aim_tree_fnac = NULL; tvbuff_t *subtvb; int orig_offset; const aim_subtype *subtype; proto_tree *family_tree = NULL; const aim_family *family; - void* pd_save; orig_offset = offset; family_id = tvb_get_ntohs(tvb, offset); @@ -696,7 +694,6 @@ dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, int offset, id = tvb_get_ntohl(tvb, offset); offset += 4; - if( aim_tree && subtype != NULL ) { offset = orig_offset; @@ -740,11 +737,6 @@ dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, int offset, } subtvb = tvb_new_subset_remaining(tvb, offset); - aiminfo.tcpinfo = (struct tcpinfo *)pinfo->private_data; - aiminfo.family = family_id; - aiminfo.subtype = subtype_id; - pd_save = pinfo->private_data; - pinfo->private_data = &aiminfo; if (family) col_set_str(pinfo->cinfo, COL_PROTOCOL, family->name); @@ -776,8 +768,6 @@ dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, int offset, { subtype->dissector(subtvb, pinfo, family_tree); } - - pinfo->private_data = pd_save; } static void |