diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-17 21:34:05 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-17 21:34:05 +0000 |
| commit | 953c6fed13a771f58dda635859d12732ea6a6129 (patch) | |
| tree | 17db6431957a80b6d6c76364068b6c8591e71a11 /plugins/irda | |
| parent | af15a51a6bdb1004ed2d1304106b0a8d24987615 (diff) | |
emem -> wmem
svn path=/trunk/; revision=52130
Diffstat (limited to 'plugins/irda')
| -rw-r--r-- | plugins/irda/packet-irda.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index 4c1e325be7..083bc499b3 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -34,7 +34,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/emem.h> +#include <epan/wmem/wmem.h> #include <epan/xdlc.h> #include "irda-appl.h" @@ -550,7 +550,7 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r } if (iap_conv->pnext == NULL) { - iap_conv->pnext = se_new(iap_conversation_t); + iap_conv->pnext = wmem_new(wmem_file_scope(), iap_conversation_t); iap_conv = iap_conv->pnext; break; } @@ -560,7 +560,7 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r else { conv = conversation_new(pinfo->fd->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); - iap_conv = se_new(iap_conversation_t); + iap_conv = wmem_new(wmem_file_scope(), iap_conversation_t); conversation_add_proto_data(conv, proto_iap, (void*)iap_conv); } @@ -1224,7 +1224,7 @@ void add_lmp_conversation(packet_info* pinfo, guint8 dlsap, gboolean ttp, dissec if (lmp_conv->pnext == NULL) { - lmp_conv->pnext = se_new(lmp_conversation_t); + lmp_conv->pnext = wmem_new(wmem_file_scope(), lmp_conversation_t); lmp_conv = lmp_conv->pnext; break; } @@ -1234,7 +1234,7 @@ void add_lmp_conversation(packet_info* pinfo, guint8 dlsap, gboolean ttp, dissec else { conv = conversation_new(pinfo->fd->num, &destaddr, &srcaddr, PT_NONE, dlsap, 0, NO_PORT_B); - lmp_conv = se_new(lmp_conversation_t); + lmp_conv = wmem_new(wmem_file_scope(), lmp_conversation_t); conversation_add_proto_data(conv, proto_irlmp, (void*)lmp_conv); } |