aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2008-01-03 17:49:59 +0000
committerAnders Broman <anders.broman@ericsson.com>2008-01-03 17:49:59 +0000
commita67838484c96fa8f8a4cbce91f16c6f5cb1f80ee (patch)
treef8708c05142d272eb5243fb179c439dc2bebd3a4 /asn1
parent370f87d9be3154e63f5365fa4d96f81be974b47d (diff)
Get rid of ber_created_item().
svn path=/trunk/; revision=24007
Diffstat (limited to 'asn1')
-rw-r--r--asn1/cms/cms.cnf4
-rw-r--r--asn1/gsmmap/packet-gsmmap-template.c4
2 files changed, 3 insertions, 5 deletions
diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf
index 1f655d26e5..1452d4a843 100644
--- a/asn1/cms/cms.cnf
+++ b/asn1/cms/cms.cnf
@@ -129,7 +129,7 @@ EncryptedContentInfo/contentType encryptedContentType
%(DEFAULT_BODY)s
- pi = get_ber_last_created_item();
+ pi = actx->created_item;
/* move past TLV */
old_offset = get_ber_identifier(tvb, old_offset, NULL, NULL, NULL);
@@ -176,7 +176,7 @@ EncryptedContentInfo/contentType encryptedContentType
#.FN_FTR EncryptedContent
- item = get_ber_last_created_item();
+ item = actx->created_item;
PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, item);
diff --git a/asn1/gsmmap/packet-gsmmap-template.c b/asn1/gsmmap/packet-gsmmap-template.c
index c5b4731771..e1d5581374 100644
--- a/asn1/gsmmap/packet-gsmmap-template.c
+++ b/asn1/gsmmap/packet-gsmmap-template.c
@@ -270,13 +270,11 @@ gsm_map_calc_bitrate(guint8 value){
static void
dissect_gsm_map_ext_qos_subscribed(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_){
int offset = 0;
- proto_item *item;
proto_tree *subtree;
guint8 octet;
guint16 value;
- item = get_ber_last_created_item();
- subtree = proto_item_add_subtree(item, ett_gsm_map_ext_qos_subscribed);
+ subtree = proto_item_add_subtree(actx->created_item, ett_gsm_map_ext_qos_subscribed);
/* OCTET 1:
Allocation/Retention Priority (This octet encodes each priority level defined in
23.107 as the binary value of the priority level, declaration in 29.060)