Merging upstream version 4.4.0.

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

1 files changed, 28 insertions, 28 deletions

diff --git a/epan/dissectors/packet-hdcp.c b/epan/dissectors/packet-hdcp.c
index 2b04890a..c8ae7a10 100644
--- a/epan/dissectors/packet-hdcp.c
+++ b/epan/dissectors/packet-hdcp.c
@@ -23,30 +23,30 @@
 #include <epan/ptvcursor.h>
 void proto_register_hdcp(void);
 
-static int proto_hdcp  = -1;
+static int proto_hdcp;
 
 static wmem_tree_t *transactions;
 
-static gint ett_hdcp = -1;
-
-static int hf_hdcp_reg = -1;
-static int hf_hdcp_resp_in = -1;
-static int hf_hdcp_resp_to = -1;
-static int hf_hdcp_a_ksv = -1;
-static int hf_hdcp_b_ksv = -1;
-static int hf_hdcp_an = -1;
-static int hf_hdcp_hdmi_reserved = -1;
-static int hf_hdcp_repeater = -1;
-static int hf_hdcp_ksv_fifo = -1;
-static int hf_hdcp_fast_trans = -1;
-static int hf_hdcp_features = -1;
-static int hf_hdcp_fast_reauth = -1;
-static int hf_hdcp_hdmi_mode = -1;
-static int hf_hdcp_max_casc_exc = -1;
-static int hf_hdcp_depth = -1;
-static int hf_hdcp_max_devs_exc = -1;
-static int hf_hdcp_downstream = -1;
-static int hf_hdcp_link_vfy = -1;
+static int ett_hdcp;
+
+static int hf_hdcp_reg;
+static int hf_hdcp_resp_in;
+static int hf_hdcp_resp_to;
+static int hf_hdcp_a_ksv;
+static int hf_hdcp_b_ksv;
+static int hf_hdcp_an;
+static int hf_hdcp_hdmi_reserved;
+static int hf_hdcp_repeater;
+static int hf_hdcp_ksv_fifo;
+static int hf_hdcp_fast_trans;
+static int hf_hdcp_features;
+static int hf_hdcp_fast_reauth;
+static int hf_hdcp_hdmi_mode;
+static int hf_hdcp_max_casc_exc;
+static int hf_hdcp_depth;
+static int hf_hdcp_max_devs_exc;
+static int hf_hdcp_downstream;
+static int hf_hdcp_link_vfy;
 
 #define REG_BKSV    0x0
 #define REG_AKSV    0x10
@@ -55,9 +55,9 @@ static int hf_hdcp_link_vfy = -1;
 #define REG_BSTATUS 0x41
 
 typedef struct _hdcp_transaction_t {
-    guint32 rqst_frame;
-    guint32 resp_frame;
-    guint8 rqst_type;
+    uint32_t rqst_frame;
+    uint32_t resp_frame;
+    uint8_t rqst_type;
 } hdcp_transaction_t;
 
 static const value_string hdcp_reg[] = {
@@ -76,13 +76,13 @@ static const value_string hdcp_reg[] = {
 static int
 dissect_hdcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-    guint8 reg;
+    uint8_t reg;
     proto_item *pi;
     ptvcursor_t *cursor;
     proto_tree *hdcp_tree;
     hdcp_transaction_t *hdcp_trans;
     proto_item *it;
-    guint64 a_ksv, b_ksv;
+    uint64_t a_ksv, b_ksv;
 
     /* XXX check if the packet is really HDCP? */
 
@@ -98,7 +98,7 @@ dissect_hdcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
     if (pinfo->p2p_dir==P2P_DIR_SENT) {
         /* transmitter sends data to the receiver */
 
-        reg = tvb_get_guint8(tvb, ptvcursor_current_offset(cursor));
+        reg = tvb_get_uint8(tvb, ptvcursor_current_offset(cursor));
         /* all values in HDCP are little endian */
         ptvcursor_add(cursor, hf_hdcp_reg, 1, ENC_LITTLE_ENDIAN);
 
@@ -297,7 +297,7 @@ proto_register_hdcp(void)
                 FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL } }
     };
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_hdcp
     };