diff options
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/ldap/packet-ldap-template.c | 60 | ||||
-rw-r--r-- | asn1/tetra/packet-tetra-template.c | 18 |
2 files changed, 41 insertions, 37 deletions
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index 1d83292dbe..dd6eb1faff 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -535,22 +535,22 @@ static int dissect_mscldap_ntver_flags(proto_tree *parent_tree, tvbuff_t *tvb, i guint32 flags; proto_item *item; proto_tree *tree=NULL; - guint fields[] = { - hf_mscldap_ntver_flags_v1, - hf_mscldap_ntver_flags_v5, - hf_mscldap_ntver_flags_v5ex, - hf_mscldap_ntver_flags_v5ep, - hf_mscldap_ntver_flags_vcs, - hf_mscldap_ntver_flags_vnt4, - hf_mscldap_ntver_flags_vpdc, - hf_mscldap_ntver_flags_vip, - hf_mscldap_ntver_flags_vl, - hf_mscldap_ntver_flags_vgc, - 0 }; - guint *field; header_field_info *hfi; gboolean one_bit_set = FALSE; + guint fields[11]; + fields[0] = hf_mscldap_ntver_flags_v1; + fields[1] = hf_mscldap_ntver_flags_v5; + fields[2] = hf_mscldap_ntver_flags_v5ex; + fields[3] = hf_mscldap_ntver_flags_v5ep; + fields[4] = hf_mscldap_ntver_flags_vcs; + fields[5] = hf_mscldap_ntver_flags_vnt4; + fields[6] = hf_mscldap_ntver_flags_vpdc; + fields[7] = hf_mscldap_ntver_flags_vip; + fields[8] = hf_mscldap_ntver_flags_vl; + fields[9] = hf_mscldap_ntver_flags_vgc; + fields[10] = 0; + flags=tvb_get_letohl(tvb, offset); item=proto_tree_add_item(parent_tree, hf_mscldap_ntver_flags, tvb, offset, 4, ENC_LITTLE_ENDIAN); @@ -1376,26 +1376,26 @@ static int dissect_mscldap_netlogon_flags(proto_tree *parent_tree, tvbuff_t *tvb guint32 flags; proto_item *item; proto_tree *tree=NULL; - guint fields[] = { - hf_mscldap_netlogon_flags_fnc, - hf_mscldap_netlogon_flags_dnc, - hf_mscldap_netlogon_flags_dns, - hf_mscldap_netlogon_flags_wdc, - hf_mscldap_netlogon_flags_rodc, - hf_mscldap_netlogon_flags_ndnc, - hf_mscldap_netlogon_flags_good_timeserv, - hf_mscldap_netlogon_flags_writable, - hf_mscldap_netlogon_flags_closest, - hf_mscldap_netlogon_flags_timeserv, - hf_mscldap_netlogon_flags_kdc, - hf_mscldap_netlogon_flags_ds, - hf_mscldap_netlogon_flags_ldap, - hf_mscldap_netlogon_flags_gc, - hf_mscldap_netlogon_flags_pdc, - 0 }; guint *field; header_field_info *hfi; gboolean one_bit_set = FALSE; + guint fields[16]; + fields[0] = hf_mscldap_netlogon_flags_fnc; + fields[1] = hf_mscldap_netlogon_flags_dnc; + fields[2] = hf_mscldap_netlogon_flags_dns; + fields[3] = hf_mscldap_netlogon_flags_wdc; + fields[4] = hf_mscldap_netlogon_flags_rodc; + fields[5] = hf_mscldap_netlogon_flags_ndnc; + fields[6] = hf_mscldap_netlogon_flags_good_timeserv; + fields[7] = hf_mscldap_netlogon_flags_writable; + fields[8] = hf_mscldap_netlogon_flags_closest; + fields[9] = hf_mscldap_netlogon_flags_timeserv; + fields[10] = hf_mscldap_netlogon_flags_kdc; + fields[11] = hf_mscldap_netlogon_flags_ds; + fields[12] = hf_mscldap_netlogon_flags_ldap; + fields[13] = hf_mscldap_netlogon_flags_gc; + fields[14] = hf_mscldap_netlogon_flags_pdc; + fields[15] = 0; flags=tvb_get_letohl(tvb, offset); item=proto_tree_add_item(parent_tree, hf_mscldap_netlogon_flags, tvb, offset, 4, ENC_LITTLE_ENDIAN); diff --git a/asn1/tetra/packet-tetra-template.c b/asn1/tetra/packet-tetra-template.c index d1450361b4..e65ab1e975 100644 --- a/asn1/tetra/packet-tetra-template.c +++ b/asn1/tetra/packet-tetra-template.c @@ -353,12 +353,12 @@ static void dissect_tetra_UNITDATA_IND(tvbuff_t *tvb, packet_info *pinfo, proto_ pdu_offset = offset + 4; for(i = 0; i < channels; i++) { - gint hf_channel[] = { - hf_tetra_rxchannel1, - hf_tetra_rxchannel2, - hf_tetra_rxchannel3 - }; gint byte_len, bits_len, remaining_bits; + gint hf_channel[3]; + + hf_channel[0] = hf_tetra_rxchannel1; + hf_channel[1] = hf_tetra_rxchannel2; + hf_channel[2] = hf_tetra_rxchannel3; /* Channel type */ channel_type = (rxreg >> ((i + 1) * 4) ) & 0xf; @@ -383,7 +383,7 @@ static void dissect_tetra_UNITDATA_IND(tvbuff_t *tvb, packet_info *pinfo, proto_ } } -void dissect_tetra_UNITDATA_REQ(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tetra_tree, int offset) +static void dissect_tetra_UNITDATA_REQ(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tetra_tree, int offset) { guint32 txreg = 0; guint32 channels = 0, i; @@ -413,8 +413,12 @@ void dissect_tetra_UNITDATA_REQ(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t pdu_offset = offset + 4; for(i = 0; i < channels; i++) { - gint hf_channel[] = {hf_tetra_channel1, hf_tetra_channel2, hf_tetra_channel3}; gint byte_len, bits_len, remaining_bits; + gint hf_channel[3]; + + hf_channel[0] = hf_tetra_channel1; + hf_channel[1] = hf_tetra_channel2; + hf_channel[2] = hf_tetra_channel3; channel_type = txreg & 0xf; proto_tree_add_uint( tetra_header_tree, hf_channel[i], tvb, offset, 4, channel_type); |