Merging upstream version 4.4.0.

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

1 files changed, 7 insertions, 11 deletions

diff --git a/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.c b/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.c
index 88cd3b21..55fb2a44 100644
--- a/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.c
+++ b/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.c
@@ -15,10 +15,8 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <string.h>
-
 #include <epan/packet.h>
+#include <wsutil/array.h>
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-nt.h"
 #include "packet-windows-common.h"
@@ -27,15 +25,15 @@
 void proto_register_budb(void);
 void proto_reg_handoff_budb(void);
 
-static int proto_budb = -1;
+static int proto_budb;
 ETH_HF
 
 ETH_ETT
 
 static int
-budb_dissect_NameString_t(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep, int hf_index, guint32 param _U_)
+budb_dissect_NameString_t(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, uint8_t *drep, int hf_index, uint32_t param _U_)
 {
-    offset=dissect_ndr_vstring(tvb, offset, pinfo, tree, di, drep, 1, hf_index, FALSE, NULL);
+    offset=dissect_ndr_vstring(tvb, offset, pinfo, tree, di, drep, 1, hf_index, false, NULL);
     return offset;
 }
 
@@ -49,18 +47,16 @@ proto_register_budb(void)
 ETH_HFARR
 	};
 
-        static gint *ett[] = {
+        static int *ett[] = {
 ETH_ETTARR
         };
 
-        proto_budb = proto_register_protocol(
-                "DCE/DFS BUDB", 
-		"BUDB", "budb");
+        proto_budb = proto_register_protocol("DCE/DFS BUDB", "BUDB", "budb");
 	proto_register_field_array(proto_budb, hf, array_length(hf));
         proto_register_subtree_array(ett, array_length(ett));
 }
 
-static dcerpc_sub_dissector function_dissectors[] = {
+static const dcerpc_sub_dissector function_dissectors[] = {
 ETH_FT
 	{ 0, NULL, NULL, NULL },
 };