aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2013-01-10 12:42:07 +0000
committerAnders Broman <anders.broman@ericsson.com>2013-01-10 12:42:07 +0000
commit614441f9e585f81e9090274cf089a4e991f1ad6e (patch)
treee6e8e968dc56511529bf9fea014e6182dc1ac761
parent84a8c1d83a3d3b550e7feb030d8d113da317ac5e (diff)
#if 0 out unused code
svn path=/trunk/; revision=47017
-rw-r--r--asn1/sv/packet-sv-template.c9
-rw-r--r--epan/dissectors/packet-sv.c21
-rw-r--r--epan/dissectors/packet-sv.h2
3 files changed, 19 insertions, 13 deletions
diff --git a/asn1/sv/packet-sv-template.c b/asn1/sv/packet-sv-template.c
index b0e5ccec9b..e1de209f29 100644
--- a/asn1/sv/packet-sv-template.c
+++ b/asn1/sv/packet-sv-template.c
@@ -82,6 +82,7 @@ static int hf_sv_appid = -1;
static int hf_sv_length = -1;
static int hf_sv_reserve1 = -1;
static int hf_sv_reserve2 = -1;
+#if 0
static int hf_sv_phmeas_instmag_i = -1;
static int hf_sv_phsmeas_q = -1;
static int hf_sv_phsmeas_q_validity = -1;
@@ -97,7 +98,7 @@ static int hf_sv_phsmeas_q_source = -1;
static int hf_sv_phsmeas_q_test = -1;
static int hf_sv_phsmeas_q_operatorblocked = -1;
static int hf_sv_phsmeas_q_derived = -1;
-
+#endif
#include "packet-sv-hf.c"
/* Initialize the subtree pointers */
@@ -107,6 +108,7 @@ static int ett_phsmeas_q = -1;
#include "packet-sv-ett.c"
+#if 0
static const value_string sv_q_validity_vals[] = {
{ 0, "good" },
{ 1, "invalid" },
@@ -184,6 +186,7 @@ dissect_PhsMeas1(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tv
return offset;
}
+#endif
#include "packet-sv-fn.c"
/*
@@ -254,7 +257,7 @@ void proto_register_sv(void) {
{ &hf_sv_reserve2,
{ "Reserved 2", "sv.reserve2", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
-
+#if 0
{ &hf_sv_phmeas_instmag_i,
{ "value", "sv.meas_value", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
@@ -299,7 +302,7 @@ void proto_register_sv(void) {
{ &hf_sv_phsmeas_q_derived,
{ "derived", "sv.meas_quality.derived", FT_BOOLEAN, 32, NULL, Q_DERIVED, NULL, HFILL}},
-
+#endif
#include "packet-sv-hfarr.c"
};
diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c
index 5630837294..5800953e62 100644
--- a/epan/dissectors/packet-sv.c
+++ b/epan/dissectors/packet-sv.c
@@ -90,6 +90,7 @@ static int hf_sv_appid = -1;
static int hf_sv_length = -1;
static int hf_sv_reserve1 = -1;
static int hf_sv_reserve2 = -1;
+#if 0
static int hf_sv_phmeas_instmag_i = -1;
static int hf_sv_phsmeas_q = -1;
static int hf_sv_phsmeas_q_validity = -1;
@@ -105,7 +106,7 @@ static int hf_sv_phsmeas_q_source = -1;
static int hf_sv_phsmeas_q_test = -1;
static int hf_sv_phsmeas_q_operatorblocked = -1;
static int hf_sv_phsmeas_q_derived = -1;
-
+#endif
/*--- Included file: packet-sv-hf.c ---*/
#line 1 "../../asn1/sv/packet-sv-hf.c"
@@ -124,7 +125,7 @@ static int hf_sv_seqData = -1; /* Data */
static int hf_sv_smpMod = -1; /* T_smpMod */
/*--- End of included file: packet-sv-hf.c ---*/
-#line 102 "../../asn1/sv/packet-sv-template.c"
+#line 103 "../../asn1/sv/packet-sv-template.c"
/* Initialize the subtree pointers */
static int ett_sv = -1;
@@ -140,8 +141,9 @@ static gint ett_sv_SEQUENCE_OF_ASDU = -1;
static gint ett_sv_ASDU = -1;
/*--- End of included file: packet-sv-ett.c ---*/
-#line 109 "../../asn1/sv/packet-sv-template.c"
+#line 110 "../../asn1/sv/packet-sv-template.c"
+#if 0
static const value_string sv_q_validity_vals[] = {
{ 0, "good" },
{ 1, "invalid" },
@@ -219,6 +221,7 @@ dissect_PhsMeas1(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tv
return offset;
}
+#endif
/*--- Included file: packet-sv-fn.c ---*/
#line 1 "../../asn1/sv/packet-sv-fn.c"
@@ -443,7 +446,7 @@ dissect_sv_SampledValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
/*--- End of included file: packet-sv-fn.c ---*/
-#line 188 "../../asn1/sv/packet-sv-template.c"
+#line 191 "../../asn1/sv/packet-sv-template.c"
/*
* Dissect SV PDUs inside a PPDU.
@@ -513,7 +516,7 @@ void proto_register_sv(void) {
{ &hf_sv_reserve2,
{ "Reserved 2", "sv.reserve2", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
-
+#if 0
{ &hf_sv_phmeas_instmag_i,
{ "value", "sv.meas_value", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
@@ -558,7 +561,7 @@ void proto_register_sv(void) {
{ &hf_sv_phsmeas_q_derived,
{ "derived", "sv.meas_quality.derived", FT_BOOLEAN, 32, NULL, Q_DERIVED, NULL, HFILL}},
-
+#endif
/*--- Included file: packet-sv-hfarr.c ---*/
@@ -617,7 +620,7 @@ void proto_register_sv(void) {
NULL, HFILL }},
/*--- End of included file: packet-sv-hfarr.c ---*/
-#line 305 "../../asn1/sv/packet-sv-template.c"
+#line 308 "../../asn1/sv/packet-sv-template.c"
};
/* List of subtrees */
@@ -634,7 +637,7 @@ void proto_register_sv(void) {
&ett_sv_ASDU,
/*--- End of included file: packet-sv-ettarr.c ---*/
-#line 313 "../../asn1/sv/packet-sv-template.c"
+#line 316 "../../asn1/sv/packet-sv-template.c"
};
/* Register protocol */
@@ -656,4 +659,4 @@ void proto_reg_handoff_sv(void) {
sv_handle = find_dissector("sv");
dissector_add_uint("ethertype", ETHERTYPE_IEC61850_SV, sv_handle);
-} \ No newline at end of file
+}
diff --git a/epan/dissectors/packet-sv.h b/epan/dissectors/packet-sv.h
index cc29fc4c43..2414503f20 100644
--- a/epan/dissectors/packet-sv.h
+++ b/epan/dissectors/packet-sv.h
@@ -49,4 +49,4 @@ typedef struct _sv_frame_data {
guint16 smpMod;
} sv_frame_data;
-#endif /*__PACKET_SV_H__*/ \ No newline at end of file
+#endif /*__PACKET_SV_H__*/