aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/asn1/nbap
diff options
context:
space:
mode:
authorDarien Spencer <cusneud@mail.com>2018-06-09 21:55:29 +0300
committerAnders Broman <a.broman58@gmail.com>2018-06-09 21:43:32 +0000
commit4ffca502cc95212e1224951537aa4bfcf4d7de8b (patch)
tree7804e058dd3738d15158d98f6629cb369f28cfbd /epan/dissectors/asn1/nbap
parent8f3ff1d24df1c4bbbd8aa1fd439a1b23cd0cf137 (diff)
NBAP: Simplify private data creation
Change-Id: Ief23e5675f74564a3b303b5a13b4fcbd9e814c90 Reviewed-on: https://code.wireshark.org/review/28172 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/asn1/nbap')
-rw-r--r--epan/dissectors/asn1/nbap/packet-nbap-template.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/asn1/nbap/packet-nbap-template.c b/epan/dissectors/asn1/nbap/packet-nbap-template.c
index 764d9ef524..c8f392db84 100644
--- a/epan/dissectors/asn1/nbap/packet-nbap-template.c
+++ b/epan/dissectors/asn1/nbap/packet-nbap-template.c
@@ -265,10 +265,7 @@ static nbap_private_data_t* nbap_get_private_data(packet_info *pinfo)
* can't be passes to/from them.
*/
nbap_private_data_t *private_data = (nbap_private_data_t *)p_get_proto_data(pinfo->pool, pinfo, proto_nbap, 0);
- if(private_data != NULL ) {
- return private_data;
- }
- else {
+ if(private_data == NULL ) {
private_data = wmem_new0(pinfo->pool, nbap_private_data_t);
p_add_proto_data(pinfo->pool, pinfo, proto_nbap, 0, private_data);
/* Setting default values */
@@ -280,8 +277,8 @@ static nbap_private_data_t* nbap_get_private_data(packet_info *pinfo)
for (i = 0; i < maxNrOfMACdFlows; i++) {
private_data->nbap_hsdsch_channel_info[i].entity = hs;
}
- return private_data;
}
+ return private_data;
}
/* Helper function to reset the private data struct*/