diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-02-10 10:41:57 +0100 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-02-10 21:36:00 +0000 |
commit | dcb55b3a0e95d6d20b0c49555cb7b3a469897a4c (patch) | |
tree | e59885b8f2a5e9fb5fd6d0266b22108abf94262f /epan/dissectors/packet-tipc.c | |
parent | 8186ab3d9f8054478e99f5e707ddf798809a96ee (diff) |
TIPC: fix statement is indented as if it were guarded by... [-Werror=misleading-indentation] found by gcc6
b_inst_strlen = tvb_strsize(tipc_tvb, offset);
^~~~~~~~~~~~~
packet-tipc.c:1090:4: note: ...this ‘if’ clause, but it is not
if ((message_type == TIPCv2_RESET_MSG)
^~
Change-Id: I9a9f1e5e70ce183af30dd93242993bbddffdfd95
Reviewed-on: https://code.wireshark.org/review/13870
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-tipc.c')
-rw-r--r-- | epan/dissectors/packet-tipc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 59e989e190..c801fbf0c3 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -1088,7 +1088,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i offset = offset + 4; if ((message_type == TIPCv2_RESET_MSG) - || ((message_type == TIPCv2_STATE_MSG) && ((msg_size-(orig_hdr_size*4)) != 0))) /* is allowed */ + || ((message_type == TIPCv2_STATE_MSG) && ((msg_size-(orig_hdr_size*4)) != 0))){ /* is allowed */ proto_tree_add_item(tipc_tree, hf_tipcv2_bearer_instance, tipc_tvb, offset, -1, ENC_ASCII|ENC_NA); /* the bearer instance string is padded with \0 to the next word boundry */ b_inst_strlen = tvb_strsize(tipc_tvb, offset); @@ -1101,6 +1101,7 @@ dissect_tipc_v2_internal_msg(tvbuff_t *tipc_tvb, proto_tree *tipc_tree, packet_i proto_tree_add_bytes_format_value(tipc_tree, hf_tipcv2_filler_mtu_discovery, tipc_tvb, offset, -1, NULL, "%d byte%c", tvb_reported_length_remaining(tipc_tvb, offset), (padlen!=1?'s':0)); }; + } break; case TIPCv2_CONN_MANAGER: /* CONN_MANAGER uses the 36-byte header format of CONN_MSG payload messages */ |