osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

cemi: Remove superfluous checks 

Remove superfluous checks on pinfo when getting cinfo.

CID 1440377

Change-Id: Id80c4344bde755ffe54b01049108d60bc9f03323
Reviewed-on: https://code.wireshark.org/review/33166
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
This commit is contained in:
Jaap Keuter 2019-05-12 12:48:18 +02:00 committed by Peter Wu
parent 757ada0e24
commit 6580ca9b93
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-cemi.c
View File

@ -1451,7 +1451,7 @@ static void dissect_range( tvbuff_t *tvb, packet_info *pinfo, proto_item *node,
static void dissect_prop_descr( tvbuff_t* tvb, packet_info* pinfo, proto_item* cemi_node, proto_tree* cemi_list, gint* p_offset, gint size, guint8* p_error )
{
gint offset = *p_offset;
column_info* cinfo = pinfo ? pinfo->cinfo : NULL;
column_info* cinfo = pinfo->cinfo;
guint8 error = 0;
/* 4 bytes Property Description */
@ -1532,7 +1532,7 @@ static void dissect_prop_descr( tvbuff_t* tvb, packet_info* pinfo, proto_item* c
static void dissect_pid_ext( tvbuff_t *tvb, packet_info *pinfo, proto_item *cemi_node, proto_tree *cemi_list, gint *p_offset, gint size, guint8 *p_error )
{
gint offset = *p_offset;
column_info* cinfo = pinfo ? pinfo->cinfo : NULL;
column_info* cinfo = pinfo->cinfo;
guint8 error = 0;
/* 2 bytes Object Type */