diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-10-20 10:11:16 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-10-20 10:11:16 +0000 |
commit | 107e4a6c803ebbbcdcccc06081587e06d2703d12 (patch) | |
tree | c8624ddfc69064cef2fb0873b55377bd916657c7 /epan/epan.c | |
parent | 336befd903e882299bff51620eb13175d3e5bd04 (diff) |
Move resetting packet_info structure from dissect_packet() to epan_dissect_init()
It'd be actually good idea to seperate packet_info data (packet.c) from epan_dissect_t (epan.c),
but this rule is already violated.
Strict seperation could allow for example allow multiple dissection on the same epan_dissect_t
(I think it was idea behind it), but it's not working.
svn path=/trunk/; revision=52705
Diffstat (limited to 'epan/epan.c')
-rw-r--r-- | epan/epan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/epan.c b/epan/epan.c index 54c4ab5647..3fd514c6e5 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -220,7 +220,6 @@ epan_dissect_init(epan_dissect_t *edt, epan_t *session, const gboolean create_pr g_assert(edt); edt->session = session; - edt->pi.pool = wmem_allocator_new(WMEM_ALLOCATOR_SIMPLE); if (create_proto_tree) { edt->tree = proto_tree_create_root(&edt->pi); @@ -230,7 +229,8 @@ epan_dissect_init(epan_dissect_t *edt, epan_t *session, const gboolean create_pr edt->tree = NULL; } - edt->pi.dependent_frames = NULL; + memset(&edt->pi, 0, sizeof(edt->pi)); + edt->pi.pool = wmem_allocator_new(WMEM_ALLOCATOR_SIMPLE); return edt; } |