aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gvsp.c
diff options
context:
space:
mode:
authorGuy Harris <gharris@sonic.net>2020-06-18 18:14:46 -0700
committerAnders Broman <a.broman58@gmail.com>2020-06-19 11:32:26 +0000
commite1d9a226a2b8f2824a0eb162a8dc972e6e6c2dd4 (patch)
tree75f56e3f0dde68ec92613cea3f482f7f426625de /epan/dissectors/packet-gvsp.c
parent51bb2c4d7f515a24659ba0c0048392a81becda4e (diff)
Fix the type of arrays of pointers to hf_ values for bitfield routines.
The static arrays are supposed to be arrays of const pointers to int, not arrays of non-const pointers to const int. Fixing that means some bugs (scribbling on what's *supposed* to be a const array) will be caught (see packet-ieee80211-radiotap.c for examples, the first of which inspired this change and the second of which was discovered while testing compiles with this change), and removes the need for some annoying casts. Also make some of those arrays static while we're at it. Update documentation and dissector-generator tools. Change-Id: I789da5fc60aadc15797cefecfd9a9fbe9a130ccc Reviewed-on: https://code.wireshark.org/review/37517 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-gvsp.c')
-rw-r--r--epan/dissectors/packet-gvsp.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/epan/dissectors/packet-gvsp.c b/epan/dissectors/packet-gvsp.c
index 04673ffdf0..3d573d5b3f 100644
--- a/epan/dissectors/packet-gvsp.c
+++ b/epan/dissectors/packet-gvsp.c
@@ -1031,20 +1031,20 @@ static int hf_gvsp_gendc_part_header_type_specific_info_v2_2 = -1;
static int hf_gvsp_gendc_part_header_1D_size_v2_2 = -1;
static int hf_gvsp_gendc_part_header_1D_padding_v2_2 = -1;
-static const int *pixelformat_fields[] = {
+static int * const pixelformat_fields[] = {
&hf_gvsp_pixelcolor,
&hf_gvsp_pixeloccupy,
&hf_gvsp_pixelid,
NULL
};
-static const int *fieldinfo_fields[] = {
+static int * const fieldinfo_fields[] = {
&hf_gvsp_fieldid,
&hf_gvsp_fieldcount,
NULL
};
-static const int *cs_fields[] = {
+static int * const cs_fields[] = {
&hf_gvsp_cs0,
&hf_gvsp_cs1,
&hf_gvsp_cs2,
@@ -1052,7 +1052,7 @@ static const int *cs_fields[] = {
NULL
};
-static const int *sc_zone_direction_fields[] = {
+static int * const sc_zone_direction_fields[] = {
&hf_gvsp_sc_zone0_direction,
&hf_gvsp_sc_zone1_direction,
&hf_gvsp_sc_zone2_direction,
@@ -1088,20 +1088,20 @@ static const int *sc_zone_direction_fields[] = {
NULL
};
-static const int *zoneinfo_fields[] = {
+static int * const zoneinfo_fields[] = {
&hf_gvsp_zoneid,
&hf_gvsp_endofzone,
NULL
};
-static const int *zoneinfo_multipart_fields[] = {
+static int * const zoneinfo_multipart_fields[] = {
&hf_gvsp_endofpart,
&hf_gvsp_zoneid,
&hf_gvsp_endofzone,
NULL
};
-static const int *flags_fields[] = {
+static int * const flags_fields[] = {
&hf_gvsp_flagdevicespecific0,
&hf_gvsp_flagdevicespecific1,
&hf_gvsp_flagdevicespecific2,
@@ -1116,13 +1116,13 @@ static const int *flags_fields[] = {
NULL
};
-static const int *gendc_leader_flags_fields[] = {
+static int * const gendc_leader_flags_fields[] = {
&hf_gvsp_gendc_leader_flags_reserved_v2_2,
&hf_gvsp_gendc_leader_flags_preliminary_descriptor_v2_2,
NULL
};
-static const int *gendc_payload_data_flags_fields[] = {
+static int * const gendc_payload_data_flags_fields[] = {
&hf_gvsp_gendc_payload_data_flag_descriptor_flags_v2_2,
&hf_gvsp_gendc_payload_data_flag_start_of_descriptor_data_v2_2,
&hf_gvsp_gendc_payload_data_flag_end_of_descriptor_data_v2_2,
@@ -1130,20 +1130,20 @@ static const int *gendc_payload_data_flags_fields[] = {
NULL
};
-static const int *gendc_payload_flow_flags_fields[] = {
+static int * const gendc_payload_flow_flags_fields[] = {
&hf_gvsp_gendc_payload_flow_flag_first_packet_v2_2,
&hf_gvsp_gendc_payload_flow_flag_last_packet_v2_2,
NULL
};
-static const int *gendc_container_header_flags_fields[] = {
+static int * const gendc_container_header_flags_fields[] = {
&hf_gvsp_gendc_container_header_flags_timestamp_ptp_v2_2,
&hf_gvsp_gendc_container_header_flags_component_invalid_v2_2,
&hf_gvsp_gendc_container_header_flags_reserved_v2_2,
NULL
};
-static const int *gendc_container_header_variable_fields_fields[] = {
+static int * const gendc_container_header_variable_fields_fields[] = {
&hf_gvsp_gendc_container_header_variable_fields_data_size_v2_2,
&hf_gvsp_gendc_container_header_variable_fields_size_x_v2_2,
&hf_gvsp_gendc_container_header_variable_fields_size_y_v2_2,
@@ -1156,7 +1156,7 @@ static const int *gendc_container_header_variable_fields_fields[] = {
NULL
};
-static const int *gendc_component_header_flags_fields[] = {
+static int * const gendc_component_header_flags_fields[] = {
&hf_gvsp_gendc_component_header_flags_invalid_v2_2,
&hf_gvsp_gendc_component_header_flags_reserved_v2_2,
NULL