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

Fix build where compilers can't initialise multi-field struct with {0}

This commit is contained in:
Martin Mathieson 2020-08-30 16:36:02 +01:00
parent 4c9f59ee56
commit a7c8da4216
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-cipmotion.c
View File

@ -2170,7 +2170,8 @@ dissect_cipmotion(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* dat
static int dissect_cipmotion3(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* data _U_)
{
cip_conn_info_t conn_info = {0};
cip_conn_info_t conn_info;
memset(&conn_info, 0, sizeof(conn_info));
conn_info.ConnPoint = 3;
cip_io_data_input io_data_input;

12
epan/dissectors/packet-cipsafety.c
View File

@ -1962,7 +1962,8 @@ dissect_cipsafety(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
static int dissect_cipsafety_base_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
cip_safety_info_t safety_info;
cip_conn_info_t eip_conn_info = {0};
cip_conn_info_t eip_conn_info;
memset(&eip_conn_info, 0, sizeof(eip_conn_info));
safety_info.eip_conn_info = &eip_conn_info;
safety_info.compute_crc = FALSE;
@ -1977,7 +1978,8 @@ static int dissect_cipsafety_base_data(tvbuff_t *tvb, packet_info *pinfo, proto_
static int dissect_cipsafety_extended_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
cip_safety_info_t safety_info;
cip_conn_info_t eip_conn_info = {0};
cip_conn_info_t eip_conn_info;
memset(&eip_conn_info, 0, sizeof(eip_conn_info));
safety_info.eip_conn_info = &eip_conn_info;
safety_info.compute_crc = FALSE;
@ -1992,7 +1994,8 @@ static int dissect_cipsafety_extended_data(tvbuff_t *tvb, packet_info *pinfo, pr
static int dissect_cipsafety_base_time_coord(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
cip_safety_info_t safety_info;
cip_conn_info_t eip_conn_info = {0};
cip_conn_info_t eip_conn_info;
memset(&eip_conn_info, 0, sizeof(eip_conn_info));
safety_info.eip_conn_info = &eip_conn_info;
safety_info.compute_crc = FALSE;
@ -2007,7 +2010,8 @@ static int dissect_cipsafety_base_time_coord(tvbuff_t *tvb, packet_info *pinfo,
static int dissect_cipsafety_extended_time_coord(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
cip_safety_info_t safety_info;
cip_conn_info_t eip_conn_info = {0};
cip_conn_info_t eip_conn_info;
memset(&eip_conn_info, 0, sizeof(eip_conn_info));
safety_info.eip_conn_info = &eip_conn_info;
safety_info.compute_crc = FALSE;

3
epan/dissectors/packet-enip.c
View File

@ -3345,7 +3345,8 @@ dissect_dlr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
static int dissect_cip_class1(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* data _U_)
{
cip_conn_info_t conn_info = {0};
cip_conn_info_t conn_info;
memset(&conn_info, 0, sizeof(conn_info));
conn_info.TransportClass_trigger = 1;
cip_io_data_input io_data_input;