diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-07-03 16:43:31 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-07-03 16:43:31 +0000 |
| commit | d58b0bf1a1e7f6f1870c8b76b94ca01ae4a133a4 (patch) | |
| tree | 0fd8fb569d5ddcbad24bc57c99bd8b57c925153f /epan/dissectors/packet-btsmp.c | |
| parent | 82bef2abe7525cdd3c651b9a6ba8d12cb5b285bc (diff) | |
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50351
Diffstat (limited to 'epan/dissectors/packet-btsmp.c')
| -rw-r--r-- | epan/dissectors/packet-btsmp.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/dissectors/packet-btsmp.c b/epan/dissectors/packet-btsmp.c index e58cdb4e8a..c20cd13c6d 100644 --- a/epan/dissectors/packet-btsmp.c +++ b/epan/dissectors/packet-btsmp.c @@ -173,8 +173,8 @@ dissect_btsmp_key_dist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree return offset + 1; } -static void -dissect_btsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_btsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { int offset = 0; proto_item *ti; @@ -197,7 +197,7 @@ dissect_btsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tvb_length_remaining(tvb, 0) < 1) - return; + return FALSE; ti = proto_tree_add_item(tree, proto_btsmp, tvb, 0, -1, ENC_NA); st = proto_item_add_subtree(ti, ett_btsmp); @@ -275,6 +275,8 @@ dissect_btsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) default: break; } + + return offset; } void @@ -374,7 +376,7 @@ proto_register_btsmp(void) proto_btsmp = proto_register_protocol("Bluetooth Security Manager Protocol", "BT SMP", "btsmp"); - register_dissector("btsmp", dissect_btsmp, proto_btsmp); + new_register_dissector("btsmp", dissect_btsmp, proto_btsmp); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_btsmp, hf, array_length(hf)); |