Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 15 insertions, 14 deletions

diff --git a/epan/dissectors/asn1/dap/dap.cnf b/epan/dissectors/asn1/dap/dap.cnf
index 9c11b4d4..0ab35d10 100644
--- a/epan/dissectors/asn1/dap/dap.cnf
+++ b/epan/dissectors/asn1/dap/dap.cnf
@@ -186,12 +186,12 @@ SaslCredentials/credentials ABBREV=saslCredentials
 TokenData/time				ABBREV=utctime
 NameErrorData/matched		ABBREV=matched_name
 
-# This table creates the value_sting to name DAP operation codes and errors
+# This table creates the value_string to name DAP operation codes and errors
 # in file packet-dap-table.c which is included in the template file
 #
 #.TABLE_HDR
 /* DAP OPERATIONS */
-const value_string dap_opr_code_string_vals[] = {
+static const value_string dap_opr_code_string_vals[] = {
 #.TABLE_BODY OPERATION
 	{ %(&operationCode)s, "%(_ident)s" },
 #.TABLE_FTR
@@ -262,7 +262,7 @@ OPERATION.&ResultType
 
 #.FN_BODY 	DirectoryBindArgument
 
-	guint32 len;
+	uint32_t len;
 
 	/* check and see if this is an empty set */
 	dissect_ber_length(actx->pinfo, tree, tvb, offset+1, &len, NULL);
@@ -302,7 +302,7 @@ OPERATION.&ResultType
 
 				proto_item_append_text(actx->created_item," (");
 				for(i=0; i<len; i++)
-					proto_item_append_text(actx->created_item,"%%c",tvb_get_guint8(out_tvb,i));
+					proto_item_append_text(actx->created_item,"%%c",tvb_get_uint8(out_tvb,i));
 				proto_item_append_text(actx->created_item,")");
 			}
 		}
@@ -312,7 +312,7 @@ OPERATION.&ResultType
 	VAL_PTR = &problem
 
 #.FN_BODY SecurityProblem
-  guint32 problem;
+  uint32_t problem;
 
   %(DEFAULT_BODY)s
 
@@ -322,7 +322,7 @@ OPERATION.&ResultType
 	VAL_PTR = &problem
 
 #.FN_BODY ServiceProblem
-  guint32 problem;
+  uint32_t problem;
 
   %(DEFAULT_BODY)s
 
@@ -332,7 +332,7 @@ OPERATION.&ResultType
 	VAL_PTR = &problem
 
 #.FN_BODY UpdateProblem
-  guint32 problem;
+  uint32_t problem;
 
   %(DEFAULT_BODY)s
 
@@ -342,7 +342,7 @@ OPERATION.&ResultType
 	VAL_PTR = &problem
 
 #.FN_BODY LimitProblem
-  guint32 problem;
+  uint32_t problem;
 
   %(DEFAULT_BODY)s
 
@@ -352,7 +352,7 @@ OPERATION.&ResultType
 
 
 #.FN_BODY SearchArgumentData/subset  VAL_PTR=&subset
-  guint32 subset;
+  uint32_t subset;
 
   %(DEFAULT_BODY)s
 
diff --git a/epan/dissectors/asn1/dap/packet-dap-template.c b/epan/dissectors/asn1/dap/packet-dap-template.c
index 8c14a03b..ad23cc63 100644
--- a/epan/dissectors/asn1/dap/packet-dap-template.c
+++ b/epan/dissectors/asn1/dap/packet-dap-template.c
@@ -17,6 +17,7 @@
 #include <epan/oids.h>
 #include <epan/asn1.h>
 #include <epan/proto_data.h>
+#include <wsutil/array.h>
 
 #include "packet-ber.h"
 #include "packet-acse.h"
@@ -43,16 +44,16 @@ void proto_register_dap(void);
 void proto_reg_handoff_dap(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_dap = -1;
+static int proto_dap;
 
 
 #include "packet-dap-hf.c"
 
 /* Initialize the subtree pointers */
-static gint ett_dap = -1;
+static int ett_dap;
 #include "packet-dap-ett.c"
 
-static expert_field ei_dap_anonymous = EI_INIT;
+static expert_field ei_dap_anonymous;
 
 #include "packet-dap-val.h"
 
@@ -84,7 +85,7 @@ void proto_register_dap(void) {
   };
 
   /* List of subtrees */
-  static gint *ett[] = {
+  static int *ett[] = {
     &ett_dap,
 #include "packet-dap-ettarr.c"
   };
@@ -129,7 +130,7 @@ void proto_reg_handoff_dap(void) {
   /* ABSTRACT SYNTAXES */
 
   /* Register DAP with ROS (with no use of RTSE) */
-  register_ros_protocol_info("2.5.9.1", &dap_ros_info, 0, "id-as-directory-access", FALSE);
+  register_ros_protocol_info("2.5.9.1", &dap_ros_info, 0, "id-as-directory-access", false);
 
   register_idmp_protocol_info("2.5.33.0", &dap_ros_info, 0, "dap-ip");