diff options
Diffstat (limited to 'epan/dissectors/packet-bootparams.c')
| -rw-r--r-- | epan/dissectors/packet-bootparams.c | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/epan/dissectors/packet-bootparams.c b/epan/dissectors/packet-bootparams.c index 6e280c7edb..f04f16baef 100644 --- a/epan/dissectors/packet-bootparams.c +++ b/epan/dissectors/packet-bootparams.c @@ -86,50 +86,44 @@ dissect_bp_address(tvbuff_t *tvb, int offset, proto_tree *tree, int hfindex) static int -dissect_getfile_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) +dissect_getfile_call(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - if ( tree ) - { - offset = dissect_rpc_string(tvb, tree, hf_bootparams_host, offset, NULL); - offset = dissect_rpc_string(tvb, tree, hf_bootparams_fileid, offset, NULL); - } + int offset = 0; + + offset = dissect_rpc_string(tvb, tree, hf_bootparams_host, offset, NULL); + offset = dissect_rpc_string(tvb, tree, hf_bootparams_fileid, offset, NULL); return offset; } static int -dissect_getfile_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) +dissect_getfile_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - if ( tree ) - { - offset = dissect_rpc_string(tvb, tree, hf_bootparams_host, offset, NULL); - offset = dissect_bp_address(tvb, offset, tree, hf_bootparams_hostaddr); - offset = dissect_rpc_string(tvb, tree, hf_bootparams_filepath, offset, NULL); - } + int offset = 0; + + offset = dissect_rpc_string(tvb, tree, hf_bootparams_host, offset, NULL); + offset = dissect_bp_address(tvb, offset, tree, hf_bootparams_hostaddr); + offset = dissect_rpc_string(tvb, tree, hf_bootparams_filepath, offset, NULL); return offset; } static int -dissect_whoami_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) +dissect_whoami_call(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - if ( tree ) - { - offset = dissect_bp_address(tvb, offset, tree, hf_bootparams_hostaddr); - } + int offset = dissect_bp_address(tvb, 0, tree, hf_bootparams_hostaddr); return offset; } static int -dissect_whoami_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) +dissect_whoami_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { - if ( tree ) - { - offset = dissect_rpc_string(tvb, tree, hf_bootparams_host, offset, NULL); - offset = dissect_rpc_string(tvb, tree, hf_bootparams_domain, offset, NULL); - offset = dissect_bp_address(tvb, offset, tree, hf_bootparams_routeraddr); - } + int offset = 0; + + offset = dissect_rpc_string(tvb, tree, hf_bootparams_host, offset, NULL); + offset = dissect_rpc_string(tvb, tree, hf_bootparams_domain, offset, NULL); + offset = dissect_bp_address(tvb, offset, tree, hf_bootparams_routeraddr); return offset; } |