From 96b4e7e571af6cb03d288e70a051024df77245e6 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Fri, 30 Aug 2019 09:14:18 +0200 Subject: NAS 5GS: small cleanup Remove a useless assignment and a few useless return. Change-Id: I38d868fe8cb81cd86683cf660a6a6699c1e8a54b Reviewed-on: https://code.wireshark.org/review/34403 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- epan/dissectors/packet-nas_5gs.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/epan/dissectors/packet-nas_5gs.c b/epan/dissectors/packet-nas_5gs.c index 75d34fab6b..d0f63a9091 100644 --- a/epan/dissectors/packet-nas_5gs.c +++ b/epan/dissectors/packet-nas_5gs.c @@ -435,7 +435,6 @@ nas5gs_get_private_data(packet_info *pinfo) struct nas5gs_private_data *nas5gs_data = (struct nas5gs_private_data*)p_get_proto_data(pinfo->pool, pinfo, proto_nas_5gs, pinfo->curr_layer_num); if (!nas5gs_data) { nas5gs_data = wmem_new0(pinfo->pool, struct nas5gs_private_data); - nas5gs_data->payload_container_type = 0; p_add_proto_data(pinfo->pool, pinfo, proto_nas_5gs, pinfo->curr_layer_num, nas5gs_data); } return nas5gs_data; @@ -5917,8 +5916,6 @@ get_nas_5gsmm_msg_params(guint8 oct, const gchar **msg_str, int *ett_tree, int * *ett_tree = ett_nas_5gs_mm_msg[idx]; *msg_fcn_p = nas_5gs_mm_msg_fcn[idx]; } - - return; } static void @@ -5932,8 +5929,6 @@ get_nas_5gssm_msg_params(guint8 oct, const gchar **msg_str, int *ett_tree, int * *ett_tree = ett_nas_5gs_sm_msg[idx]; *msg_fcn_p = nas_5gs_sm_msg_fcn[idx]; } - - return; } static void @@ -5947,8 +5942,6 @@ get_nas_5gs_updp_msg_params(guint8 oct, const gchar** msg_str, int* ett_tree, in *ett_tree = ett_nas_5gs_updp_msg[idx]; *msg_fcn_p = nas_5gs_updp_msg_fcn[idx]; } - - return; } static void @@ -6413,7 +6406,7 @@ dissect_nas_5gs_media_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else if (!strcmp(n1_msg_class, "UPDP")) { /* UD policy delivery service */ disect_nas_5gs_updp(tvb, pinfo, tree, 0); - return tvb_captured_length(tvb);; + return tvb_captured_length(tvb); } else { subdissector = NULL; } -- cgit v1.2.3