diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-04-05 14:07:34 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-04-05 14:07:34 +0000 |
| commit | 0e0c0f39ae58bb08de67550517de7758e94a133f (patch) | |
| tree | fd7e6fc7bacd9a0224552b6687a399d49c153bef /epan/dissectors/packet-tacacs.c | |
| parent | 3592313c82a9af395ddba3e41472d103c16e6719 (diff) | |
Fix set-but-not-used warning turned error: use the newly created subtree in a few cases.
svn path=/trunk/; revision=48749
Diffstat (limited to 'epan/dissectors/packet-tacacs.c')
| -rw-r--r-- | epan/dissectors/packet-tacacs.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index e4e4e2fb0c..544a81f803 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -489,45 +489,45 @@ dissect_tacplus_body_authen_req_login( tvbuff_t* tvb, proto_tree *tree, int var_ case TAC_PLUS_AUTHEN_TYPE_CHAP: proto_tree_add_text( tree, tvb, AUTHEN_S_DATA_LEN_OFF, 1, "CHAP Data Length %d", val ); if( val ) { - proto_item *pi; - proto_tree *pt; + proto_item *pi; + proto_tree *pt; guint8 chal_len=val-(1+16); /* Response field alwayes 16 octets */ pi = proto_tree_add_text(tree, tvb, var_off, val, "CHAP Data" ); pt = proto_item_add_subtree( pi, ett_tacplus_body_chap ); - proto_tree_add_item(tree, hf_tacplus_chap_id, tvb, var_off, 1, ENC_NA); + proto_tree_add_item(pt, hf_tacplus_chap_id, tvb, var_off, 1, ENC_NA); var_off++; - proto_tree_add_item(tree, hf_tacplus_chap_challenge, tvb, var_off, chal_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(pt, hf_tacplus_chap_challenge, tvb, var_off, chal_len, ENC_ASCII|ENC_NA); var_off+=chal_len; - proto_tree_add_item(tree, hf_tacplus_chap_response, tvb, var_off, 16, ENC_ASCII|ENC_NA); + proto_tree_add_item(pt, hf_tacplus_chap_response, tvb, var_off, 16, ENC_ASCII|ENC_NA); } break; case TAC_PLUS_AUTHEN_TYPE_MSCHAP: proto_tree_add_text( tree, tvb, AUTHEN_S_DATA_LEN_OFF, 1, "MSCHAP Data Length %d", val ); if( val ) { - proto_item *pi; - proto_tree *pt; + proto_item *pi; + proto_tree *pt; guint8 chal_len=val-(1+49); /* Response field alwayes 49 octets */ pi = proto_tree_add_text(tree, tvb, var_off, val, "MSCHAP Data" ); pt = proto_item_add_subtree( pi, ett_tacplus_body_chap ); - proto_tree_add_item(tree, hf_tacplus_mschap_id, tvb, var_off, 1, ENC_NA); + proto_tree_add_item(pt, hf_tacplus_mschap_id, tvb, var_off, 1, ENC_NA); var_off++; - proto_tree_add_item(tree, hf_tacplus_mschap_challenge, tvb, var_off, chal_len, ENC_ASCII|ENC_NA); + proto_tree_add_item(pt, hf_tacplus_mschap_challenge, tvb, var_off, chal_len, ENC_ASCII|ENC_NA); var_off+=chal_len; - proto_tree_add_item(tree, hf_tacplus_mschap_response, tvb, var_off, 49, ENC_ASCII|ENC_NA); + proto_tree_add_item(pt, hf_tacplus_mschap_response, tvb, var_off, 49, ENC_ASCII|ENC_NA); } break; case TAC_PLUS_AUTHEN_TYPE_ARAP: proto_tree_add_text( tree, tvb, AUTHEN_S_DATA_LEN_OFF, 1, "ARAP Data Length %d", val ); if( val ) { - proto_item *pi; - proto_tree *pt; + proto_item *pi; + proto_tree *pt; pi = proto_tree_add_text(tree, tvb, var_off, val, "ARAP Data" ); pt = proto_item_add_subtree( pi, ett_tacplus_body_chap ); - proto_tree_add_item(tree, hf_tacplus_arap_nas_challenge, tvb, var_off, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(pt, hf_tacplus_arap_nas_challenge, tvb, var_off, 8, ENC_ASCII|ENC_NA); var_off+=8; - proto_tree_add_item(tree, hf_tacplus_arap_remote_challenge, tvb, var_off, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(pt, hf_tacplus_arap_remote_challenge, tvb, var_off, 8, ENC_ASCII|ENC_NA); var_off+=8; - proto_tree_add_item(tree, hf_tacplus_arap_remote_response, tvb, var_off, 8, ENC_ASCII|ENC_NA); + proto_tree_add_item(pt, hf_tacplus_arap_remote_response, tvb, var_off, 8, ENC_ASCII|ENC_NA); } break; |