diff options
| author | Guy Harris <gharris@sonic.net> | 2020-06-18 18:14:46 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-06-19 11:32:26 +0000 |
| commit | e1d9a226a2b8f2824a0eb162a8dc972e6e6c2dd4 (patch) | |
| tree | 75f56e3f0dde68ec92613cea3f482f7f426625de /epan/dissectors/packet-s7comm.c | |
| parent | 51bb2c4d7f515a24659ba0c0048392a81becda4e (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-s7comm.c')
| -rw-r--r-- | epan/dissectors/packet-s7comm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-s7comm.c b/epan/dissectors/packet-s7comm.c index 4897f56268..ec9dc993d4 100644 --- a/epan/dissectors/packet-s7comm.c +++ b/epan/dissectors/packet-s7comm.c @@ -1248,7 +1248,7 @@ static gint hf_s7comm_userdata_blockinfo_linked = -1; /* Some flags in Blo static gint hf_s7comm_userdata_blockinfo_standard_block = -1; static gint hf_s7comm_userdata_blockinfo_nonretain = -1; /* Some flags in Block info response */ static gint ett_s7comm_userdata_blockinfo_flags = -1; -static const int *s7comm_userdata_blockinfo_flags_fields[] = { +static int * const s7comm_userdata_blockinfo_flags_fields[] = { &hf_s7comm_userdata_blockinfo_linked, &hf_s7comm_userdata_blockinfo_standard_block, &hf_s7comm_userdata_blockinfo_nonretain, @@ -1419,7 +1419,7 @@ static gint hf_s7comm_diagdata_registerflag_ar2 = -1; /* Addressregister 2 static gint hf_s7comm_diagdata_registerflag_db1 = -1; /* Datablock register 1 */ static gint hf_s7comm_diagdata_registerflag_db2 = -1; /* Datablock register 2 */ static gint ett_s7comm_diagdata_registerflag = -1; -static const int *s7comm_diagdata_registerflag_fields[] = { +static int * const s7comm_diagdata_registerflag_fields[] = { &hf_s7comm_diagdata_registerflag_stw, &hf_s7comm_diagdata_registerflag_accu1, &hf_s7comm_diagdata_registerflag_accu2, @@ -1683,7 +1683,7 @@ static gint hf_s7comm_data_blockcontrol_functionstatus = -1; static gint hf_s7comm_data_blockcontrol_functionstatus_more = -1; static gint hf_s7comm_data_blockcontrol_functionstatus_error = -1; static gint ett_s7comm_data_blockcontrol_status = -1; -static const int *s7comm_data_blockcontrol_status_fields[] = { +static int * const s7comm_data_blockcontrol_status_fields[] = { &hf_s7comm_data_blockcontrol_functionstatus_more, &hf_s7comm_data_blockcontrol_functionstatus_error, NULL @@ -1756,7 +1756,7 @@ static gint hf_s7comm_cpu_alarm_message_signal_sig6 = -1; static gint hf_s7comm_cpu_alarm_message_signal_sig7 = -1; static gint hf_s7comm_cpu_alarm_message_signal_sig8 = -1; static gint ett_s7comm_cpu_alarm_message_signal = -1; -static const int *s7comm_cpu_alarm_message_signal_fields[] = { +static int * const s7comm_cpu_alarm_message_signal_fields[] = { &hf_s7comm_cpu_alarm_message_signal_sig1, &hf_s7comm_cpu_alarm_message_signal_sig2, &hf_s7comm_cpu_alarm_message_signal_sig3, @@ -1792,7 +1792,7 @@ static gint hf_s7comm_cpu_diag_msg_info1 = -1; static gint hf_s7comm_cpu_diag_msg_info2 = -1; static gint ett_s7comm_cpu_diag_msg_eventid = -1; -static const int *s7comm_cpu_diag_msg_eventid_fields[] = { +static int * const s7comm_cpu_diag_msg_eventid_fields[] = { &hf_s7comm_cpu_diag_msg_eventid_class, &hf_s7comm_cpu_diag_msg_eventid_ident_entleave, &hf_s7comm_cpu_diag_msg_eventid_ident_diagbuf, @@ -2414,7 +2414,7 @@ static gint hf_s7comm_cpu_msgservice_subscribe_events_system = -1; static gint hf_s7comm_cpu_msgservice_subscribe_events_userdefined = -1; static gint hf_s7comm_cpu_msgservice_subscribe_events_alarms = -1; static gint ett_s7comm_cpu_msgservice_subscribe_events = -1; -static const int *s7comm_cpu_msgservice_subscribe_events_fields[] = { +static int * const s7comm_cpu_msgservice_subscribe_events_fields[] = { &hf_s7comm_cpu_msgservice_subscribe_events_modetrans, &hf_s7comm_cpu_msgservice_subscribe_events_system, &hf_s7comm_cpu_msgservice_subscribe_events_userdefined, |