diff options
Diffstat (limited to 'epan/dissectors/packet-stat.c')
| -rw-r--r-- | epan/dissectors/packet-stat.c | 45 |
1 files changed, 16 insertions, 29 deletions
diff --git a/epan/dissectors/packet-stat.c b/epan/dissectors/packet-stat.c index 29c9199213..8db649f26a 100644 --- a/epan/dissectors/packet-stat.c +++ b/epan/dissectors/packet-stat.c @@ -178,16 +178,13 @@ dissect_stat_stat(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree static int dissect_stat_stat_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - proto_item* sub_item = NULL; - proto_tree* sub_tree = NULL; + proto_item* sub_item; + proto_tree* sub_tree; gint32 res; - if (tree) { - sub_item = proto_tree_add_item(tree, &hfi_stat_stat_res, tvb, + sub_item = proto_tree_add_item(tree, &hfi_stat_stat_res, tvb, offset, -1, ENC_NA); - if (sub_item) - sub_tree = proto_item_add_subtree(sub_item, ett_stat_stat_res); - } + sub_tree = proto_item_add_subtree(sub_item, ett_stat_stat_res); res = tvb_get_ntohl(tvb, offset); offset = dissect_rpc_uint32(tvb,sub_tree,hfi_stat_stat_res_res.id,offset); @@ -204,15 +201,12 @@ dissect_stat_stat_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t static int dissect_stat_my_id(tvbuff_t *tvb, int offset, proto_tree *tree) { - proto_item* sub_item = NULL; - proto_tree* sub_tree = NULL; + proto_item* sub_item; + proto_tree* sub_tree; - if (tree) { - sub_item = proto_tree_add_item(tree, &hfi_stat_my_id, tvb, + sub_item = proto_tree_add_item(tree, &hfi_stat_my_id, tvb, offset, my_id_len(tvb,offset), ENC_NA); - if (sub_item) - sub_tree = proto_item_add_subtree(sub_item, ett_stat_my_id); - } + sub_tree = proto_item_add_subtree(sub_item, ett_stat_my_id); offset = dissect_rpc_string(tvb,sub_tree,hfi_stat_my_id_hostname.id,offset,NULL); offset = dissect_rpc_uint32(tvb,sub_tree,hfi_stat_my_id_prog.id,offset); @@ -225,16 +219,12 @@ dissect_stat_my_id(tvbuff_t *tvb, int offset, proto_tree *tree) static int dissect_stat_mon_id(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - proto_item* sub_item = NULL; - proto_tree* sub_tree = NULL; + proto_item* sub_item; + proto_tree* sub_tree; - if (tree) { - sub_item = proto_tree_add_item(tree, &hfi_stat_mon, tvb, + sub_item = proto_tree_add_item(tree, &hfi_stat_mon, tvb, offset, mon_id_len(tvb,offset), ENC_NA); - if (sub_item) - sub_tree = proto_item_add_subtree(sub_item, ett_stat_mon); - } - + sub_tree = proto_item_add_subtree(sub_item, ett_stat_mon); offset = dissect_rpc_string(tvb,sub_tree,hfi_stat_mon_id_name.id,offset,NULL); @@ -273,16 +263,13 @@ dissect_stat_state(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree static int dissect_stat_notify(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - proto_item* sub_item = NULL; - proto_tree* sub_tree = NULL; + proto_item* sub_item; + proto_tree* sub_tree; int start_offset = offset; - if (tree) { - sub_item = proto_tree_add_item(tree, &hfi_stat_stat_chge, tvb, + sub_item = proto_tree_add_item(tree, &hfi_stat_stat_chge, tvb, offset, -1, ENC_NA); - if (sub_item) - sub_tree = proto_item_add_subtree(sub_item, ett_stat_stat_chge); - } + sub_tree = proto_item_add_subtree(sub_item, ett_stat_stat_chge); offset = dissect_rpc_string(tvb,sub_tree,hfi_stat_mon_id_name.id,offset,NULL); |