From Kovarththanan Rajaratnam:

Move header field info declarations into function scope.

This is the first step. Another patch will be submitted which actually scrubs
the header field info declarations (remove empty blurbs, etc.)

svn path=/trunk/; revision=28797

1 files changed, 79 insertions, 79 deletions

diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c
index 64f0d6a082..0c4ce4af69 100644
--- a/epan/dissectors/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
@@ -236,85 +236,6 @@ static const value_string oam_defect_type_vals[] = {
     {0, NULL }
 };
 
-static hf_register_info mplsf_info[] = {
-
-    /* MPLS header fields */
-    {&mpls_filter[MPLSF_LABEL],
-     {"MPLS Label", "mpls.label", FT_UINT32, BASE_DEC, VALS(special_labels), 0x0,
-      "", HFILL }},
-
-    {&mpls_filter[MPLSF_EXP],
-     {"MPLS Experimental Bits", "mpls.exp", FT_UINT8, BASE_DEC, NULL, 0x0,
-      "", HFILL }},
-
-    {&mpls_filter[MPLSF_BOTTOM_OF_STACK],
-     {"MPLS Bottom Of Label Stack", "mpls.bottom", FT_UINT8, BASE_DEC, NULL, 0x0,
-      "", HFILL }},
-
-    {&mpls_filter[MPLSF_TTL],
-     {"MPLS TTL", "mpls.ttl", FT_UINT8, BASE_DEC, NULL, 0x0,
-      "", HFILL }},
-
-    /* 1st nibble */
-     {&hf_mpls_1st_nibble,
-     {"MPLS 1st nibble", "mpls.1st_nibble", FT_UINT8, 
-       BASE_DEC, NULL, 0x0, "MPLS 1st nibble", HFILL }},
-
-    /* PW Associated Channel Header fields */
-    {&hf_mpls_pw_ach_ver,
-     {"PW Associated Channel Version", "pwach.ver", FT_UINT8, BASE_DEC, 
-      NULL, 0x0, "PW Associated Channel Version", HFILL }},
-
-    {&hf_mpls_pw_ach_res,
-     {"Reserved", "pwach.res", FT_UINT8, BASE_DEC, 
-      NULL, 0x0, "Reserved", HFILL }},
-
-    {&hf_mpls_pw_ach_channel_type,
-     {"PW Associated Channel Type", "pwach.channel_type", FT_UINT16, BASE_HEX, 
-      NULL, 0x0, "PW Associated Channel Type", HFILL }},
-
-    /* Generic/Preferred PW MPLS Control Word fields */
-    {&hf_mpls_pw_mcw_flags,
-     {"Generic/Preferred PW MPLS Control Word Flags", "pwmcw.flags", FT_UINT8,
-      BASE_HEX, NULL, 0x0, "Generic/Preferred PW MPLS Control Word Flags", 
-      HFILL }},
-
-    {&hf_mpls_pw_mcw_length,
-     {"Generic/Preferred PW MPLS Control Word Length", "pwmcw.length", FT_UINT8,
-      BASE_DEC, NULL, 0x0, "Generic/Preferred PW MPLS Control Word Length", 
-      HFILL }},
-
-    {&hf_mpls_pw_mcw_sequence_number,
-     {"Generic/Preferred PW MPLS Control Word Sequence Number",
-      "pwmcw.sequence_number", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "Generic/Preferred PW MPLS Control Word Sequence Number", HFILL }},
-
-    /* OAM header fields */
-    {&hf_mpls_oam_function_type,
-     {"Function Type", "mpls.oam.function_type", FT_UINT8, 
-      BASE_HEX, VALS(oam_function_type_vals), 0x0, "Function Type codepoint", HFILL }},
-
-    {&hf_mpls_oam_ttsi,
-     {"Trail Termination Source Identifier", "mpls.oam.ttsi", FT_UINT32, 
-      BASE_HEX, NULL, 0x0, "Trail Termination Source Identifier", HFILL }},
-
-    {&hf_mpls_oam_frequency,
-     {"Frequency", "mpls.oam.frequency", FT_UINT8, 
-      BASE_HEX, VALS(oam_frequency_vals), 0x0, "Frequency of probe injection", HFILL }},
-
-    {&hf_mpls_oam_defect_type,
-     {"Defect Type", "mpls.oam.defect_type", FT_UINT16, 
-      BASE_HEX, VALS(oam_defect_type_vals), 0x0, "Defect Type", HFILL }},
-
-    {&hf_mpls_oam_defect_location,
-     {"Defect Location (AS)", "mpls.oam.defect_location", FT_UINT32, 
-      BASE_DEC, NULL, 0x0, "Defect Location", HFILL }},
-
-    {&hf_mpls_oam_bip16,
-     {"BIP16", "mpls.oam.bip16", FT_UINT16, 
-      BASE_HEX, NULL, 0x0, "BIP16", HFILL }},
-};
-
 static dissector_table_t ppp_subdissector_table;
 static dissector_table_t mpls_subdissector_table;
 
@@ -773,6 +694,85 @@ dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 void
 proto_register_mpls(void)
 {
+	static hf_register_info mplsf_info[] = {
+
+		/* MPLS header fields */
+		{&mpls_filter[MPLSF_LABEL],
+		 {"MPLS Label", "mpls.label", FT_UINT32, BASE_DEC, VALS(special_labels), 0x0,
+		  "", HFILL }},
+
+		{&mpls_filter[MPLSF_EXP],
+		 {"MPLS Experimental Bits", "mpls.exp", FT_UINT8, BASE_DEC, NULL, 0x0,
+		  "", HFILL }},
+
+		{&mpls_filter[MPLSF_BOTTOM_OF_STACK],
+		 {"MPLS Bottom Of Label Stack", "mpls.bottom", FT_UINT8, BASE_DEC, NULL, 0x0,
+		  "", HFILL }},
+
+		{&mpls_filter[MPLSF_TTL],
+		 {"MPLS TTL", "mpls.ttl", FT_UINT8, BASE_DEC, NULL, 0x0,
+		  "", HFILL }},
+
+		/* 1st nibble */
+		 {&hf_mpls_1st_nibble,
+		 {"MPLS 1st nibble", "mpls.1st_nibble", FT_UINT8, 
+		   BASE_DEC, NULL, 0x0, "MPLS 1st nibble", HFILL }},
+
+		/* PW Associated Channel Header fields */
+		{&hf_mpls_pw_ach_ver,
+		 {"PW Associated Channel Version", "pwach.ver", FT_UINT8, BASE_DEC, 
+		  NULL, 0x0, "PW Associated Channel Version", HFILL }},
+
+		{&hf_mpls_pw_ach_res,
+		 {"Reserved", "pwach.res", FT_UINT8, BASE_DEC, 
+		  NULL, 0x0, "Reserved", HFILL }},
+
+		{&hf_mpls_pw_ach_channel_type,
+		 {"PW Associated Channel Type", "pwach.channel_type", FT_UINT16, BASE_HEX, 
+		  NULL, 0x0, "PW Associated Channel Type", HFILL }},
+
+		/* Generic/Preferred PW MPLS Control Word fields */
+		{&hf_mpls_pw_mcw_flags,
+		 {"Generic/Preferred PW MPLS Control Word Flags", "pwmcw.flags", FT_UINT8,
+		  BASE_HEX, NULL, 0x0, "Generic/Preferred PW MPLS Control Word Flags", 
+		  HFILL }},
+
+		{&hf_mpls_pw_mcw_length,
+		 {"Generic/Preferred PW MPLS Control Word Length", "pwmcw.length", FT_UINT8,
+		  BASE_DEC, NULL, 0x0, "Generic/Preferred PW MPLS Control Word Length", 
+		  HFILL }},
+
+		{&hf_mpls_pw_mcw_sequence_number,
+		 {"Generic/Preferred PW MPLS Control Word Sequence Number",
+		  "pwmcw.sequence_number", FT_UINT16, BASE_DEC, NULL, 0x0,
+		  "Generic/Preferred PW MPLS Control Word Sequence Number", HFILL }},
+
+		/* OAM header fields */
+		{&hf_mpls_oam_function_type,
+		 {"Function Type", "mpls.oam.function_type", FT_UINT8, 
+		  BASE_HEX, VALS(oam_function_type_vals), 0x0, "Function Type codepoint", HFILL }},
+
+		{&hf_mpls_oam_ttsi,
+		 {"Trail Termination Source Identifier", "mpls.oam.ttsi", FT_UINT32, 
+		  BASE_HEX, NULL, 0x0, "Trail Termination Source Identifier", HFILL }},
+
+		{&hf_mpls_oam_frequency,
+		 {"Frequency", "mpls.oam.frequency", FT_UINT8, 
+		  BASE_HEX, VALS(oam_frequency_vals), 0x0, "Frequency of probe injection", HFILL }},
+
+		{&hf_mpls_oam_defect_type,
+		 {"Defect Type", "mpls.oam.defect_type", FT_UINT16, 
+		  BASE_HEX, VALS(oam_defect_type_vals), 0x0, "Defect Type", HFILL }},
+
+		{&hf_mpls_oam_defect_location,
+		 {"Defect Location (AS)", "mpls.oam.defect_location", FT_UINT32, 
+		  BASE_DEC, NULL, 0x0, "Defect Location", HFILL }},
+
+		{&hf_mpls_oam_bip16,
+		 {"BIP16", "mpls.oam.bip16", FT_UINT16, 
+		  BASE_HEX, NULL, 0x0, "BIP16", HFILL }},
+	};
+
 	static gint *ett[] = {
 		&ett_mpls,
 		&ett_mpls_pw_ach,