diff options
| author | Evan Huus <eapache@gmail.com> | 2013-06-19 23:08:58 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-06-19 23:08:58 +0000 |
| commit | 8b0f1addd990ae1b6616dbb5a21e530942461154 (patch) | |
| tree | e72f102e0cec19ee49b5729f8dcfa62afa3a931d /epan/dissectors/packet-h225.c | |
| parent | e6e7c1181bd33a94de00e137685f39520bd858dc (diff) | |
Apparently one of our major global headers must include emem.h, because I just
found a bunch more asn1 dissectors using emem without ever directly including
the header. Convert those to wmem as well, which involves add a number of
#include directives since dissectors do *not* automatically pull in the wmem
headers.
svn path=/trunk/; revision=50066
Diffstat (limited to 'epan/dissectors/packet-h225.c')
| -rw-r--r-- | epan/dissectors/packet-h225.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 896c4503b3..f7d705d0ed 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -45,6 +45,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> +#include <epan/wmem/wmem.h> #include <string.h> @@ -885,7 +886,7 @@ static int hf_h225_stopped = -1; /* NULL */ static int hf_h225_notAvailable = -1; /* NULL */ /*--- End of included file: packet-h225-hf.c ---*/ -#line 106 "../../asn1/h225/packet-h225-template.c" +#line 107 "../../asn1/h225/packet-h225-template.c" /* Initialize the subtree pointers */ static gint ett_h225 = -1; @@ -1134,7 +1135,7 @@ static gint ett_h225_ServiceControlResponse = -1; static gint ett_h225_T_result = -1; /*--- End of included file: packet-h225-ett.c ---*/ -#line 110 "../../asn1/h225/packet-h225-template.c" +#line 111 "../../asn1/h225/packet-h225-template.c" /* Preferences */ static guint h225_tls_port = TLS_PORT_CS; @@ -2882,7 +2883,7 @@ dissect_h225_T_guid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro offset = dissect_h225_GloballyUniqueID(tvb, offset, actx, tree, hf_index); if (guid_tvb) - tvb_get_ntohguid(guid_tvb, 0, call_id_guid = ep_new(e_guid_t)); + tvb_get_ntohguid(guid_tvb, 0, call_id_guid = wmem_new(wmem_packet_scope(), e_guid_t)); actx->value_ptr = NULL; @@ -3685,7 +3686,7 @@ dissect_h225_T_standard(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, 0U, 16383U, &value_int, TRUE); gefx = gef_ctx_get(actx->private_data); - if (gefx) gefx->id = ep_strdup_printf("%u", value_int); + if (gefx) gefx->id = wmem_strdup_printf(wmem_packet_scope(), "%u", value_int); return offset; @@ -7534,7 +7535,7 @@ static int dissect_RasMessage_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-h225-fn.c ---*/ -#line 134 "../../asn1/h225/packet-h225-template.c" +#line 135 "../../asn1/h225/packet-h225-template.c" /* Forward declaration we need below */ @@ -10716,7 +10717,7 @@ void proto_register_h225(void) { NULL, HFILL }}, /*--- End of included file: packet-h225-hfarr.c ---*/ -#line 231 "../../asn1/h225/packet-h225-template.c" +#line 232 "../../asn1/h225/packet-h225-template.c" }; /* List of subtrees */ @@ -10967,7 +10968,7 @@ void proto_register_h225(void) { &ett_h225_T_result, /*--- End of included file: packet-h225-ettarr.c ---*/ -#line 237 "../../asn1/h225/packet-h225-template.c" +#line 238 "../../asn1/h225/packet-h225-template.c" }; module_t *h225_module; |