diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-02-12 18:02:39 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-02-12 18:02:39 +0000 |
| commit | da795748388210755db3cf2b2187fb0b1bb6d31e (patch) | |
| tree | 2c6dfa0561ef9f512e3c90125483b2561392b4db | |
| parent | da053ea8d323416b53e7c2320a1b04fba752db77 (diff) | |
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40990
| -rw-r--r-- | epan/dissectors/packet-gsm_abis_oml.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-gsm_abis_oml.c b/epan/dissectors/packet-gsm_abis_oml.c index 560569c87a..392d07c9ff 100644 --- a/epan/dissectors/packet-gsm_abis_oml.c +++ b/epan/dissectors/packet-gsm_abis_oml.c @@ -1562,7 +1562,6 @@ dissect_oml_attrs(tvbuff_t *tvb, int base_offs, packet_info *pinfo, break; case TLV_TYPE_UNKNOWN: /* fall through */ default: - hlen = len_len = len = 0; DISSECTOR_ASSERT_NOT_REACHED(); break; } @@ -1807,7 +1806,7 @@ dissect_oml_manuf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return dissect_oml_fom(tvb, pinfo, tree, offset, top_ti); } -static void +static int dissect_abis_oml(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti; @@ -1847,6 +1846,8 @@ dissect_abis_oml(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } } + + return offset; } void @@ -2345,7 +2346,7 @@ proto_register_abis_oml(void) proto_register_subtree_array(ett, array_length(ett)); - register_dissector("gsm_abis_oml", dissect_abis_oml, proto_abis_oml); + new_register_dissector("gsm_abis_oml", dissect_abis_oml, proto_abis_oml); oml_module = prefs_register_protocol(proto_abis_oml, proto_reg_handoff_abis_oml); prefs_register_enum_preference(oml_module, "oml_dialect", @@ -2364,7 +2365,7 @@ proto_reg_handoff_abis_oml(void) if (!initialized) { dissector_handle_t abis_oml_handle; - abis_oml_handle = create_dissector_handle(dissect_abis_oml, + abis_oml_handle = new_create_dissector_handle(dissect_abis_oml, proto_abis_oml); dissector_add_uint("lapd.gsm.sapi", LAPD_GSM_SAPI_OM_PROC, abis_oml_handle); |