aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-l2tp.c
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2015-06-28 13:18:58 -0700
committerMichael Mann <mmann78@netscape.net>2015-07-03 23:37:18 +0000
commitea46cf4f73c72bf343a5d07ba33166d696a3d1f6 (patch)
tree72b7ea5bc05e06dcd526ec3b170604bffd2a62f5 /epan/dissectors/packet-l2tp.c
parent7ce77c69ea4f3424616558729ec23cf3dd1de694 (diff)
Split init of misc dissectors into init/cleanup functions
Convert remaining dissectors to use cleanup routines when possible. (Single-)linked lists require NULL, so do reset their pointers to NULL. Generated with https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=69af86e6c2cf965ba3d7f9636b647b195f0b7d57 (with AUDIT = ALWAYS_EMIT_CLEANUP_CODE = True) Remaining dissectors which did not need further changes: epan/dissectors/packet-aeron.c epan/dissectors/packet-bootp.c epan/dissectors/packet-brdwlk.c epan/dissectors/packet-drda.c epan/dissectors/packet-etch.c epan/dissectors/packet-fix.c epan/dissectors/packet-fw1.c epan/dissectors/packet-lbm.c epan/dissectors/packet-ldss.c epan/dissectors/packet-simulcrypt.c epan/dissectors/packet-spdy.c epan/dissectors/packet-starteam.c epan/dissectors/packet-udp.c Change-Id: Idcacfea6a5de38d40e67db4cdcd0452ad9f9a6a9 Reviewed-on: https://code.wireshark.org/review/9228 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-l2tp.c')
-rw-r--r--epan/dissectors/packet-l2tp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c
index 3ec831de67..b6b0833ced 100644
--- a/epan/dissectors/packet-l2tp.c
+++ b/epan/dissectors/packet-l2tp.c
@@ -2659,7 +2659,7 @@ static int dissect_atm_oam_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
return tvb_captured_length(tvb);
}
-static void init_l2tp_dissection(void)
+static void l2tp_cleanup(void)
{
GSList *iterator = list_heads;
@@ -3029,7 +3029,7 @@ proto_register_l2tp(void)
"Shared secret used for control message digest authentication",
&shared_secret);
- register_init_routine(init_l2tp_dissection);
+ register_cleanup_routine(l2tp_cleanup);
register_decode_as(&l2tp_da);
}