ASN.1: Use proto_tree_add_bitmask... () for named bits.

Change-Id: Ied0c91ea070ee76603e7ecb29d874e0c1a65892e
Reviewed-on: https://code.wireshark.org/review/32684
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 23 insertions, 23 deletions

diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index 588e8a23e2..74cd56df8f 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -2171,35 +2171,35 @@ dissect_cmip_CMIPAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const asn_namedbit FunctionalUnits_bits[] = {
-  {  0, &hf_cmip_FunctionalUnits_multipleObjectSelection, -1, -1, "multipleObjectSelection", NULL },
-  {  1, &hf_cmip_FunctionalUnits_filter, -1, -1, "filter", NULL },
-  {  2, &hf_cmip_FunctionalUnits_multipleReply, -1, -1, "multipleReply", NULL },
-  {  3, &hf_cmip_FunctionalUnits_extendedService, -1, -1, "extendedService", NULL },
-  {  4, &hf_cmip_FunctionalUnits_cancelGet, -1, -1, "cancelGet", NULL },
-  { 0, NULL, 0, 0, NULL, NULL }
+static const int * FunctionalUnits_bits[] = {
+  &hf_cmip_FunctionalUnits_multipleObjectSelection,
+  &hf_cmip_FunctionalUnits_filter,
+  &hf_cmip_FunctionalUnits_multipleReply,
+  &hf_cmip_FunctionalUnits_extendedService,
+  &hf_cmip_FunctionalUnits_cancelGet,
+  NULL
 };
 
 static int
 dissect_cmip_FunctionalUnits(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
-                                    FunctionalUnits_bits, hf_index, ett_cmip_FunctionalUnits,
+                                    FunctionalUnits_bits, 5, hf_index, ett_cmip_FunctionalUnits,
                                     NULL);
 
   return offset;
 }
 
 
-static const asn_namedbit ProtocolVersion_bits[] = {
-  {  0, &hf_cmip_ProtocolVersion_version1, -1, -1, "version1", NULL },
-  {  1, &hf_cmip_ProtocolVersion_version2, -1, -1, "version2", NULL },
-  { 0, NULL, 0, 0, NULL, NULL }
+static const int * ProtocolVersion_bits[] = {
+  &hf_cmip_ProtocolVersion_version1,
+  &hf_cmip_ProtocolVersion_version2,
+  NULL
 };
 
 static int
 dissect_cmip_ProtocolVersion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
-                                    ProtocolVersion_bits, hf_index, ett_cmip_ProtocolVersion,
+                                    ProtocolVersion_bits, 2, hf_index, ett_cmip_ProtocolVersion,
                                     NULL);
 
   return offset;
@@ -3508,21 +3508,21 @@ dissect_cmip_UsageState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 }
 
 
-static const asn_namedbit T_daysOfWeek_bits[] = {
-  {  0, &hf_cmip_T_daysOfWeek_sunday, -1, -1, "sunday", NULL },
-  {  1, &hf_cmip_T_daysOfWeek_monday, -1, -1, "monday", NULL },
-  {  2, &hf_cmip_T_daysOfWeek_tuesday, -1, -1, "tuesday", NULL },
-  {  3, &hf_cmip_T_daysOfWeek_wednesday, -1, -1, "wednesday", NULL },
-  {  4, &hf_cmip_T_daysOfWeek_thursday, -1, -1, "thursday", NULL },
-  {  5, &hf_cmip_T_daysOfWeek_friday, -1, -1, "friday", NULL },
-  {  6, &hf_cmip_T_daysOfWeek_saturday, -1, -1, "saturday", NULL },
-  { 0, NULL, 0, 0, NULL, NULL }
+static const int * T_daysOfWeek_bits[] = {
+  &hf_cmip_T_daysOfWeek_sunday,
+  &hf_cmip_T_daysOfWeek_monday,
+  &hf_cmip_T_daysOfWeek_tuesday,
+  &hf_cmip_T_daysOfWeek_wednesday,
+  &hf_cmip_T_daysOfWeek_thursday,
+  &hf_cmip_T_daysOfWeek_friday,
+  &hf_cmip_T_daysOfWeek_saturday,
+  NULL
 };
 
 static int
 dissect_cmip_T_daysOfWeek(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
-                                    T_daysOfWeek_bits, hf_index, ett_cmip_T_daysOfWeek,
+                                    T_daysOfWeek_bits, 7, hf_index, ett_cmip_T_daysOfWeek,
                                     NULL);
 
   return offset;