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, 82 insertions, 82 deletions

diff --git a/plugins/wimax/msg_aas_beam.c b/plugins/wimax/msg_aas_beam.c
index 70ca17f5f6..3d0e8f2d76 100644
--- a/plugins/wimax/msg_aas_beam.c
+++ b/plugins/wimax/msg_aas_beam.c
@@ -105,107 +105,107 @@ static int hf_aas_beam_rssi_value = -1;
 static int hf_aas_beam_cinr_value = -1;
 #endif
 
-/* AAS-BEAM display */
-static hf_register_info hf_aas_beam[] =
+/* Register Wimax Mac Payload Protocol and Dissector */
+void proto_register_mac_mgmt_msg_aas_beam(void)
 {
+	/* AAS-BEAM display */
+	static hf_register_info hf_aas_beam[] =
 	{
-		&hf_aas_beam_message_type,
 		{
-			"MAC Management Message Type", "wmx.macmgtmsgtype.aas_beam", 
-			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
-		}
-	},
-	{
-		&hf_aas_beam_select_index,
+			&hf_aas_beam_message_type,
+			{
+				"MAC Management Message Type", "wmx.macmgtmsgtype.aas_beam", 
+				FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+			}
+		},
 		{
-			"AAS Beam Index", "wmx.aas_beam.aas_beam_index", 
-			FT_UINT8, BASE_DEC, NULL, AAS_BEAM_SELECT_AAS_BEAM_INDEX_MASK, "", HFILL
-		}
-	},
-	{
-		&hf_aas_beam_beam_bit_mask,
+			&hf_aas_beam_select_index,
+			{
+				"AAS Beam Index", "wmx.aas_beam.aas_beam_index", 
+				FT_UINT8, BASE_DEC, NULL, AAS_BEAM_SELECT_AAS_BEAM_INDEX_MASK, "", HFILL
+			}
+		},
 		{
-			"Beam Bit Mask", "wmx.aas_beam.beam_bit_mask", 
-			FT_UINT8, BASE_HEX, NULL, AAS_BEAM_BEAM_BIT_MASK_MASK, "", HFILL
-		}
-	},
+			&hf_aas_beam_beam_bit_mask,
+			{
+				"Beam Bit Mask", "wmx.aas_beam.beam_bit_mask", 
+				FT_UINT8, BASE_HEX, NULL, AAS_BEAM_BEAM_BIT_MASK_MASK, "", HFILL
+			}
+		},
 #ifdef OFDM
-	{
-		&hf_aas_beam_cinr_value,
 		{
-			"CINR Mean Value", "wmx.aas_beam.cinr_mean_value", 
-			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
-		}
-	},
-	{
-		&hf_aas_beam_feedback_request_number,
+			&hf_aas_beam_cinr_value,
+			{
+				"CINR Mean Value", "wmx.aas_beam.cinr_mean_value", 
+				FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+			}
+		},
 		{
-			"Feedback Request Number", "wmx.aas_beam.feedback_request_number", 
-			FT_UINT8, BASE_DEC, NULL, AAS_BEAM_FEEDBACK_REQUEST_NUMBER_MASK, "", HFILL
-		}
-	},
-	{
-		&hf_aas_beam_frame_number,
+			&hf_aas_beam_feedback_request_number,
+			{
+				"Feedback Request Number", "wmx.aas_beam.feedback_request_number", 
+				FT_UINT8, BASE_DEC, NULL, AAS_BEAM_FEEDBACK_REQUEST_NUMBER_MASK, "", HFILL
+			}
+		},
 		{
-			"Frame Number", "wmx.aas_beam.frame_number", 
-			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
-		}
-	},
-	{
-		&hf_aas_beam_freq_value_im,
+			&hf_aas_beam_frame_number,
+			{
+				"Frame Number", "wmx.aas_beam.frame_number", 
+				FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+			}
+		},
 		{
-			"Frequency Value (imaginary part)", "wmx.aas_beam.freq_value_im", 
-			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
-		}
-	},
-	{
-		&hf_aas_beam_freq_value_re,
+			&hf_aas_beam_freq_value_im,
+			{
+				"Frequency Value (imaginary part)", "wmx.aas_beam.freq_value_im", 
+				FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+			}
+		},
 		{
-			"Frequency Value (real part)", "wmx.aas_beam.freq_value_re", 
-			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
-		}
-	},
-	{
-		&hf_aas_beam_measurement_report_type,
+			&hf_aas_beam_freq_value_re,
+			{
+				"Frequency Value (real part)", "wmx.aas_beam.freq_value_re", 
+				FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+			}
+		},
 		{
-			"Measurement Report Type", "wmx.aas_beam.measurement_report_type", 
-			FT_UINT8, BASE_DEC, VALS(vals_report_types), AAS_BEAM_MEASUREMENT_REPORT_TYPE_MASK, "", HFILL
-		}
-	},
-	{
-		&hf_aas_beam_select_reserved,
+			&hf_aas_beam_measurement_report_type,
+			{
+				"Measurement Report Type", "wmx.aas_beam.measurement_report_type", 
+				FT_UINT8, BASE_DEC, VALS(vals_report_types), AAS_BEAM_MEASUREMENT_REPORT_TYPE_MASK, "", HFILL
+			}
+		},
 		{
-			"Reserved", "wmx.aas_beam.reserved", 
-			FT_UINT8, BASE_HEX, NULL, AAS_BEAM_SELECT_RESERVED_MASK, "", HFILL
-		}
-	},
-	{
-		&hf_aas_beam_resolution_parameter,
+			&hf_aas_beam_select_reserved,
+			{
+				"Reserved", "wmx.aas_beam.reserved", 
+				FT_UINT8, BASE_HEX, NULL, AAS_BEAM_SELECT_RESERVED_MASK, "", HFILL
+			}
+		},
 		{
-			"Resolution Parameter", "wmx.aas_beam.resolution_parameter", 
-			FT_UINT8, BASE_DEC, VALS(vals_resolution_parameter), AAS_BEAM_RESOLUTION_PARAMETER_MASK, "", HFILL
-		}
-	},
-	{
-		&hf_aas_beam_rssi_value,
+			&hf_aas_beam_resolution_parameter,
+			{
+				"Resolution Parameter", "wmx.aas_beam.resolution_parameter", 
+				FT_UINT8, BASE_DEC, VALS(vals_resolution_parameter), AAS_BEAM_RESOLUTION_PARAMETER_MASK, "", HFILL
+			}
+		},
 		{
-			"RSSI Mean Value", "wmx.aas_beam.rssi_mean_value", 
-			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
-		}
-	},
+			&hf_aas_beam_rssi_value,
+			{
+				"RSSI Mean Value", "wmx.aas_beam.rssi_mean_value", 
+				FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL
+			}
+		},
 #endif
-	{
-		&hf_aas_beam_unknown_type,
 		{
-			"Unknown TLV type", "wmx.aas_beam.unknown_type", 
-			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
+			&hf_aas_beam_unknown_type,
+			{
+				"Unknown TLV type", "wmx.aas_beam.unknown_type", 
+				FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL
+			}
 		}
-	}
-};
+	};
 
-/* Register Wimax Mac Payload Protocol and Dissector */
-void proto_register_mac_mgmt_msg_aas_beam(void)
-{
 	if (proto_mac_mgmt_msg_aas_beam_decoder == -1)
 	{
 		proto_mac_mgmt_msg_aas_beam_decoder = proto_mac_mgmt_msg_aas_fbck_decoder;