modbustcp: fix a shadowed variable warning
The checkapi code dislikes variables named time so rename it. Change-Id: I49727203baacb32869b78d047e86b478b8e5c25c Reviewed-on: https://code.wireshark.org/review/32840 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
parent
9df7d1b6f1
commit
65b5f50859
|
@ -1577,7 +1577,7 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
|
|||
if (captured_length >= 5)
|
||||
pkt_info->num_reg = frame_ptr->num_reg = tvb_get_ntohs(tvb, 3);
|
||||
}
|
||||
frame_ptr->time = pinfo->abs_ts;
|
||||
frame_ptr->req_time = pinfo->abs_ts;
|
||||
|
||||
wmem_list_prepend(modbus_conv_data->modbus_request_frame_data, frame_ptr);
|
||||
}
|
||||
|
@ -1598,7 +1598,7 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
|
|||
pkt_info->num_reg = request_data->num_reg;
|
||||
pkt_info->request_found = TRUE;
|
||||
pkt_info->req_frame_num = req_frame_num;
|
||||
pkt_info->req_time = request_data->time;
|
||||
pkt_info->req_time = request_data->req_time;
|
||||
}
|
||||
frame = wmem_list_frame_next(frame);
|
||||
}
|
||||
|
|
|
@ -97,7 +97,7 @@ typedef struct {
|
|||
guint8 function_code;
|
||||
guint16 base_address;
|
||||
guint16 num_reg;
|
||||
nstime_t time;
|
||||
nstime_t req_time;
|
||||
} modbus_request_info_t;
|
||||
|
||||
/* List contains request data */
|
||||
|
|
Loading…
Reference in New Issue