diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-09-03 12:00:40 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-09-03 12:00:40 +0000 |
| commit | 5ad3e5331e929920fcca0657622f557f2e2358f2 (patch) | |
| tree | cef16aa8c778151e33e48b3018eef977094fe252 /asn1 | |
| parent | 1db996e051c6ffab1e5d7a61ccf44aff0b28ac29 (diff) | |
| download | wireshark-5ad3e5331e929920fcca0657622f557f2e2358f2.tar.gz | |
MT: move global frame_end_routines to packet_info.
svn path=/trunk/; revision=44748
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/ldap/packet-ldap-template.c | 2 | ||||
| -rw-r--r-- | asn1/x509if/x509if.cnf | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index 983e9a1501..005178f318 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -1079,7 +1079,7 @@ static void col_set_fence(pinfo->cinfo, COL_INFO); } else { col_clear(pinfo->cinfo, COL_INFO); - register_frame_end_routine (ldap_frame_end); + register_frame_end_routine (pinfo, ldap_frame_end); ldap_found_in_frame = TRUE; } diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf index b3c0f32a1d..eeb010e33b 100644 --- a/asn1/x509if/x509if.cnf +++ b/asn1/x509if/x509if.cnf @@ -213,7 +213,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison" if((fmt = val_to_str(hf_index, fmt_vals, "")) && *fmt) { /* we have a format */ last_ava = ep_alloc(MAX_AVA_STR_LEN); *last_ava = '\0'; - register_frame_end_routine (x509if_frame_end); + register_frame_end_routine (actx->pinfo, x509if_frame_end); g_snprintf(last_ava, MAX_AVA_STR_LEN, "%%s %%s", name, fmt); @@ -335,7 +335,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison" rdn_one_value = FALSE; top_of_rdn = tree; last_rdn = ep_alloc(MAX_DN_STR_LEN); *last_rdn = '\0'; - register_frame_end_routine (x509if_frame_end); + register_frame_end_routine (actx->pinfo, x509if_frame_end); %(DEFAULT_BODY)s @@ -377,7 +377,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison" dn_one_rdn = FALSE; /* reset */ last_dn = ep_alloc(MAX_DN_STR_LEN); *last_dn = '\0'; top_of_dn = NULL; - register_frame_end_routine (x509if_frame_end); + register_frame_end_routine (actx->pinfo, x509if_frame_end); %(DEFAULT_BODY)s @@ -408,7 +408,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison" ava_hf_index = hf_index; last_ava = ep_alloc(MAX_AVA_STR_LEN); *last_ava = '\0'; - register_frame_end_routine (x509if_frame_end); + register_frame_end_routine (actx->pinfo, x509if_frame_end); %(DEFAULT_BODY)s @@ -416,7 +416,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison" #.FN_BODY Attribute doing_attr = TRUE; - register_frame_end_routine (x509if_frame_end); + register_frame_end_routine (actx->pinfo, x509if_frame_end); %(DEFAULT_BODY)s #.END |