diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-04-12 21:00:26 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-04-12 21:00:26 +0000 |
commit | e98f5fc23d87fd67b9113b1936782ffe9d82656d (patch) | |
tree | 2008ff5cf456c170732fcaddec80f835a0e00ee8 /epan/dissectors/packet-csn1.c | |
parent | 01e072411f317978d0fa7527ca597ba552135350 (diff) |
Cleanup ProcessError().
Coverity 865.
svn path=/trunk/; revision=36610
Diffstat (limited to 'epan/dissectors/packet-csn1.c')
-rw-r--r-- | epan/dissectors/packet-csn1.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/epan/dissectors/packet-csn1.c b/epan/dissectors/packet-csn1.c index 171aeacda8..4c830901c7 100644 --- a/epan/dissectors/packet-csn1.c +++ b/epan/dissectors/packet-csn1.c @@ -100,18 +100,13 @@ static gint16 ProcessError(proto_tree *tree, tvbuff_t *tvb, gint bit_offset, unsigned char* sz, gint16 err, const CSN_DESCR* pDescr) { gint16 i = MIN(-err, ((gint16) ElementsOf(ErrCodes)-1)); - proto_item *ti; - if (1) + if (i >= 0) { - if (i >= 0) - { - ti = proto_tree_add_text(tree, tvb, bit_offset>>3, 1, "ERROR %s %s (%s)", sz, ErrCodes[i], pDescr?pDescr->sz:"-"); - } - else - { - ti = proto_tree_add_text(tree, tvb, bit_offset>>3, 1, "ERROR %s (%s)", sz, pDescr?pDescr->sz:"-"); - - } + proto_tree_add_text(tree, tvb, bit_offset>>3, 1, "ERROR %s %s (%s)", sz, ErrCodes[i], pDescr?pDescr->sz:"-"); + } + else + { + proto_tree_add_text(tree, tvb, bit_offset>>3, 1, "ERROR %s (%s)", sz, pDescr?pDescr->sz:"-"); } return err; |