diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-08-17 00:38:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-08-17 00:38:54 +0000 |
| commit | 36c6e86029a5dd37c40f85fc980f5973867632ff (patch) | |
| tree | 01976b917e73a87ee76e51a20e96844d6499b6ff /epan/dissectors/packet-smb-pipe.c | |
| parent | f0fc3c20df45e48f6026f5f47b778e24b1abbf0f (diff) | |
| download | wireshark-36c6e86029a5dd37c40f85fc980f5973867632ff.tar.gz | |
Get rid of an unused variable.
For some routines, instead of having them check for -1 as the hf_index
and using a default hf_index in that case, just pass them the default
hf_index instead of -1 and just use the hf_index unconditionally.
svn path=/trunk/; revision=51399
Diffstat (limited to 'epan/dissectors/packet-smb-pipe.c')
| -rw-r--r-- | epan/dissectors/packet-smb-pipe.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index bb82c82772..94bbba6699 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -258,15 +258,7 @@ static int add_word_param(tvbuff_t *tvb, int offset, int count _U_, packet_info *pinfo _U_, proto_tree *tree, int convert _U_, int hf_index) { - guint16 WParam; - - if (hf_index != -1) { - proto_tree_add_item(tree, hf_index, tvb, offset, 2, - ENC_LITTLE_ENDIAN); - } else { - WParam = tvb_get_letohs(tvb, offset); - proto_tree_add_item(tree, hf_smb_pipe_word_param, tvb, offset, 2, ENC_LITTLE_ENDIAN); - } + proto_tree_add_item(tree, hf_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; return offset; } @@ -275,11 +267,7 @@ static int add_dword_param(tvbuff_t *tvb, int offset, int count _U_, packet_info *pinfo _U_, proto_tree *tree, int convert _U_, int hf_index) { - if (hf_index != -1) { - proto_tree_add_item(tree, hf_index, tvb, offset, 4, ENC_LITTLE_ENDIAN); - } else { - proto_tree_add_item(tree, hf_smb_pipe_doubleword_param, tvb, offset, 4, ENC_LITTLE_ENDIAN); - } + proto_tree_add_item(tree, hf_index, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; return offset; } @@ -1641,7 +1629,7 @@ dissect_request_parameters(tvbuff_t *tvb, int offset, packet_info *pinfo, * fall back on the default. */ offset = add_word_param(tvb, offset, 0, pinfo, - tree, 0, -1); + tree, 0, hf_smb_pipe_word_param); } else if (items->type != PARAM_WORD) { /* * Descriptor character is 'W', but this @@ -1672,7 +1660,7 @@ dissect_request_parameters(tvbuff_t *tvb, int offset, packet_info *pinfo, * fall back on the default. */ offset = add_dword_param(tvb, offset, 0, pinfo, - tree, 0, -1); + tree, 0, hf_smb_pipe_doubleword_param); } else if (items->type != PARAM_DWORD) { /* * Descriptor character is 'D', but this @@ -1887,7 +1875,7 @@ dissect_response_parameters(tvbuff_t *tvb, int offset, packet_info *pinfo, * fall back on the default. */ offset = add_word_param(tvb, offset, 0, pinfo, - tree, 0, -1); + tree, 0, hf_smb_pipe_word_param); } else if (items->type != PARAM_WORD) { /* * Descriptor character is 'h', but this @@ -1918,7 +1906,7 @@ dissect_response_parameters(tvbuff_t *tvb, int offset, packet_info *pinfo, * fall back on the default. */ offset = add_dword_param(tvb, offset, 0, pinfo, - tree, 0, -1); + tree, 0, hf_smb_pipe_doubleword_param); } else if (items->type != PARAM_DWORD) { /* * Descriptor character is 'i', but this @@ -1989,7 +1977,7 @@ dissect_transact_data(tvbuff_t *tvb, int offset, int convert, * fall back on the default. */ offset = add_word_param(tvb, offset, 0, pinfo, - tree, convert, -1); + tree, convert, hf_smb_pipe_word_param); } else if (items->type != PARAM_WORD) { /* * Descriptor character is 'W', but this @@ -2022,7 +2010,7 @@ dissect_transact_data(tvbuff_t *tvb, int offset, int convert, * fall back on the default. */ offset = add_dword_param(tvb, offset, 0, pinfo, - tree, convert, -1); + tree, convert, hf_smb_pipe_doubleword_param); } else if (items->type != PARAM_DWORD) { /* * Descriptor character is 'D', but this |