diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2014-06-15 15:56:35 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2014-06-15 13:59:07 +0000 |
| commit | 237fa1cac2834cd12c7bae47a9aa6c6fe339576d (patch) | |
| tree | 833b43d05eccb3703fe3fc445ed09cb3f0e655e3 | |
| parent | 9e4cb64a850a97e48a7ec714f141977d9bfbed04 (diff) | |
| download | wireshark-237fa1cac2834cd12c7bae47a9aa6c6fe339576d.tar.gz wireshark-237fa1cac2834cd12c7bae47a9aa6c6fe339576d.tar.bz2 wireshark-237fa1cac2834cd12c7bae47a9aa6c6fe339576d.zip | |
Fix warnings turning errors (also fixes buildbot)
These fixes are superficial. Michael: Please review and either remove
the unneeded stuff or put in the correct use.
Change-Id: I15e0f8c746af5bd76f57965ddcbf06d9e4ac80ca
Reviewed-on: https://code.wireshark.org/review/2223
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
| -rw-r--r-- | epan/dissectors/packet-ipmi-se.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ipmi.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-ospf.c | 8 |
3 files changed, 15 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c index 28e8418a0d..4b2c97d224 100644 --- a/epan/dissectors/packet-ipmi-se.c +++ b/epan/dissectors/packet-ipmi-se.c @@ -2004,7 +2004,7 @@ cfgparam_11(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *tree) } static void -cfgparam_12(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree) +cfgparam_12(tvbuff_t *tvb, packet_info* pinfo _U_, proto_tree *tree) { proto_item *ti; proto_tree *s_tree; diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c index 27ddc6d1dd..c3c9b3a9f2 100644 --- a/epan/dissectors/packet-ipmi.c +++ b/epan/dissectors/packet-ipmi.c @@ -1768,11 +1768,15 @@ proto_register_ipmi(void) { "pps", "Pigeon Point Systems", IPMI_OEM_PPS }, { NULL, NULL, 0 } }; +#if 0 static ei_register_info ei[] = { { &ei_impi_parser_not_implemented, { "ipmi.parser_not_implemented", PI_UNDECODED, PI_WARN, "[PARSER NOT IMPLEMENTED]", EXPFILL }}, }; +#endif module_t *m; +#if 0 expert_module_t* expert_ipmi; +#endif guint32 i; proto_ipmi = proto_register_protocol("Intelligent Platform Management Interface", @@ -1791,7 +1795,9 @@ proto_register_ipmi(void) proto_register_field_array(proto_ipmi, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); +#if 0 expert_ipmi = expert_register_protocol(proto_ipmi); +#endif ipmi_netfn_setdesc(IPMI_CHASSIS_REQ, "Chassis", 0); ipmi_netfn_setdesc(IPMI_BRIDGE_REQ, "Bridge", 0); diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 1446df125e..812e775734 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -2869,7 +2869,9 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t guint8 reserved; /* router LSA */ +#if 0 guint8 router_priority; +#endif guint32 number_prefixes; guint8 prefix_length; guint16 reserved16; @@ -2877,7 +2879,9 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t guint16 referenced_ls_type; guint8 flags; +#if 0 guint32 external_route_tag; +#endif ls_type = tvb_get_ntohs(tvb, offset + 2); @@ -3098,7 +3102,9 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t /* External Route Tag (optional - only if T-flag is on) */ if ( (offset < end_offset) && (flags & OSPF_V3_AS_EXTERNAL_FLAG_T) ) { +#if 0 external_route_tag=tvb_get_ntohl(tvb, offset); +#endif proto_tree_add_item(ospf_lsa_tree, hf_ospf_v3_lsa_external_route_tag, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; @@ -3115,7 +3121,9 @@ dissect_ospf_v3_lsa(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *t case OSPF_V3_LSTYPE_LINK: /* router priority */ +#if 0 router_priority=tvb_get_guint8(tvb, offset); +#endif proto_tree_add_item(ospf_lsa_tree, hf_ospf_v3_lsa_router_priority, tvb, offset, 1, ENC_NA); /* options field in an link-lsa */ |