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-h323.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-h323.c')
| -rw-r--r-- | epan/dissectors/packet-h323.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/epan/dissectors/packet-h323.c b/epan/dissectors/packet-h323.c index 6ae3c3767b..0e123c20a1 100644 --- a/epan/dissectors/packet-h323.c +++ b/epan/dissectors/packet-h323.c @@ -37,6 +37,7 @@ #include <epan/packet.h> #include <epan/oids.h> #include <epan/asn1.h> +#include <epan/wmem/wmem.h> #include "packet-per.h" #include "packet-h225.h" @@ -51,7 +52,7 @@ gef_ctx_t* gef_ctx_alloc(gef_ctx_t *parent, const gchar *type) { gef_ctx_t *gefx; - gefx = ep_new0(gef_ctx_t); + gefx = wmem_new0(wmem_packet_scope(), gef_ctx_t); gefx->signature = GEF_CTX_SIGNATURE; gefx->parent = parent; gefx->type = type; @@ -83,7 +84,7 @@ void gef_ctx_update_key(gef_ctx_t *gefx) { if (!gefx) return; parent_key = (gefx->parent) ? gefx->parent->key : NULL; - gefx->key = ep_strdup_printf( + gefx->key = wmem_strdup_printf(wmem_packet_scope(), "%s%s" /* parent prefix */ "%s%s%s" /* type, id */ "%s%s" /* subid */, @@ -128,7 +129,7 @@ static int hf_h323_timeToLive = -1; /* TimeToLive */ static int hf_h323_includeFastStart = -1; /* NULL */ /*--- End of included file: packet-h323-hf.c ---*/ -#line 91 "../../asn1/h323/packet-h323-template.c" +#line 92 "../../asn1/h323/packet-h323-template.c" /* Initialize the subtree pointers */ @@ -149,7 +150,7 @@ static gint ett_h323_T_fastStart = -1; static gint ett_h323_StatusInquiry_RD = -1; /*--- End of included file: packet-h323-ett.c ---*/ -#line 94 "../../asn1/h323/packet-h323-template.c" +#line 95 "../../asn1/h323/packet-h323-template.c" /*--- Included file: packet-h323-fn.c ---*/ @@ -440,7 +441,7 @@ static int dissect_RobustnessData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-h323-fn.c ---*/ -#line 96 "../../asn1/h323/packet-h323-template.c" +#line 97 "../../asn1/h323/packet-h323-template.c" /*--- proto_register_h323 ----------------------------------------------*/ void proto_register_h323(void) { @@ -564,7 +565,7 @@ void proto_register_h323(void) { NULL, HFILL }}, /*--- End of included file: packet-h323-hfarr.c ---*/ -#line 103 "../../asn1/h323/packet-h323-template.c" +#line 104 "../../asn1/h323/packet-h323-template.c" }; /* List of subtrees */ @@ -587,7 +588,7 @@ void proto_register_h323(void) { &ett_h323_StatusInquiry_RD, /*--- End of included file: packet-h323-ettarr.c ---*/ -#line 108 "../../asn1/h323/packet-h323-template.c" +#line 109 "../../asn1/h323/packet-h323-template.c" }; /* Register protocol */ |