replace "unsigned" datatype with "guint". Some mpeg files needed "unsigned int" instead.

bugs 7825-7827 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7825)

svn path=/trunk/; revision=46928

4 files changed, 41 insertions, 41 deletions

diff --git a/plugins/irda/irda-appl.h b/plugins/irda/irda-appl.h
index a7aa63ae9b..354aba3c18 100644
--- a/plugins/irda/irda-appl.h
+++ b/plugins/irda/irda-appl.h
@@ -50,8 +50,8 @@ typedef enum {
     DATA_PDU
 } pdu_type_t;
 
-typedef gboolean (*ias_value_dissector_t)(tvbuff_t* tvb, unsigned offset, packet_info* pinfo, proto_tree* tree,
-                                          unsigned list_index, guint8 attr_type);
+typedef gboolean (*ias_value_dissector_t)(tvbuff_t* tvb, guint offset, packet_info* pinfo, proto_tree* tree,
+                                          guint list_index, guint8 attr_type);
 
 typedef const struct ias_attr_dissector {
     const char*             attr_name;
@@ -64,14 +64,14 @@ typedef const struct ias_class_dissector {
 } ias_class_dissector_t;
 
 
-extern gboolean check_iap_octet_result(tvbuff_t* tvb, proto_tree* tree, unsigned offset,
+extern gboolean check_iap_octet_result(tvbuff_t* tvb, proto_tree* tree, guint offset,
                                        const char* attr_name, guint8 attr_type);
-extern guint8 check_iap_lsap_result(tvbuff_t* tvb, proto_tree* tree, unsigned offset,
+extern guint8 check_iap_lsap_result(tvbuff_t* tvb, proto_tree* tree, guint offset,
                                     const char* attr_name, guint8 attr_type);
 
 extern void add_lmp_conversation(packet_info* pinfo, guint8 dlsap, gboolean ttp, dissector_t proto_dissector);
 
-extern unsigned dissect_param_tuple(tvbuff_t* tvb, proto_tree* tree, unsigned offset);
+extern unsigned dissect_param_tuple(tvbuff_t* tvb, proto_tree* tree, guint offset);
 
 /*
  * Protocol exports.
diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c
index 2939b79b97..f0921671e6 100644
--- a/plugins/irda/packet-ircomm.c
+++ b/plugins/irda/packet-ircomm.c
@@ -135,12 +135,12 @@ static int hf_param_pv = -1;
 static int hf_control = -1;
 static int hf_control_len = -1;
 
-static gboolean dissect_ircomm_parameters(tvbuff_t* tvb, unsigned offset, packet_info* pinfo,
-                                          proto_tree* tree, unsigned list_index, guint8 attr_type);
-static gboolean dissect_ircomm_ttp_lsap(tvbuff_t* tvb, unsigned offset, packet_info* pinfo,
-                                        proto_tree* tree, unsigned list_index, guint8 attr_type);
-static gboolean dissect_ircomm_lmp_lsap(tvbuff_t* tvb, unsigned offset, packet_info* pinfo,
-                                        proto_tree* tree, unsigned list_index, guint8 attr_type);
+static gboolean dissect_ircomm_parameters(tvbuff_t* tvb, guint offset, packet_info* pinfo,
+                                          proto_tree* tree, guint list_index, guint8 attr_type);
+static gboolean dissect_ircomm_ttp_lsap(tvbuff_t* tvb, guint offset, packet_info* pinfo,
+                                        proto_tree* tree, guint list_index, guint8 attr_type);
+static gboolean dissect_ircomm_lmp_lsap(tvbuff_t* tvb, guint offset, packet_info* pinfo,
+                                        proto_tree* tree, guint list_index, guint8 attr_type);
 
 ias_attr_dissector_t ircomm_attr_dissector[] = {
 /* IrDA:IrCOMM attribute dissectors */
@@ -162,10 +162,10 @@ ias_attr_dissector_t irlpt_attr_dissector[] = {
  */
 static void dissect_cooked_ircomm(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root)
 {
-    unsigned offset = 0;
-    unsigned clen;
+    guint offset = 0;
+    guint clen;
     char        buf[128];
-    unsigned    len;
+    guint    len;
 
 
     if (tvb_length(tvb) == 0)
@@ -215,7 +215,7 @@ static void dissect_cooked_ircomm(tvbuff_t* tvb, packet_info* pinfo, proto_tree*
  */
 static void dissect_raw_ircomm(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root)
 {
-    unsigned len = tvb_length(tvb);
+    guint len = tvb_length(tvb);
 	char    buf[128];
 
     if (len == 0)
@@ -241,11 +241,11 @@ static void dissect_raw_ircomm(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro
 /*
  * Dissect IrCOMM IAS "Parameters" attribute
  */
-static gboolean dissect_ircomm_parameters(tvbuff_t* tvb, unsigned offset, packet_info* pinfo _U_,
-                                          proto_tree* tree, unsigned list_index, guint8 attr_type)
+static gboolean dissect_ircomm_parameters(tvbuff_t* tvb, guint offset, packet_info* pinfo _U_,
+                                          proto_tree* tree, guint list_index, guint8 attr_type)
 {
-    unsigned    len;
-    unsigned    n = 0;
+    guint    len;
+    guint    n = 0;
     proto_item* ti;
     proto_tree* p_tree;
     char        buf[256];
@@ -331,8 +331,8 @@ static gboolean dissect_ircomm_parameters(tvbuff_t* tvb, unsigned offset, packet
 /*
  * Dissect IrCOMM IAS "IrDA:TinyTP:LsapSel" attribute
  */
-static gboolean dissect_ircomm_ttp_lsap(tvbuff_t* tvb, unsigned offset, packet_info* pinfo,
-                                        proto_tree* tree, unsigned list_index _U_, guint8 attr_type)
+static gboolean dissect_ircomm_ttp_lsap(tvbuff_t* tvb, guint offset, packet_info* pinfo,
+                                        proto_tree* tree, guint list_index _U_, guint8 attr_type)
 {
     guint8 dlsap;
 
@@ -349,8 +349,8 @@ static gboolean dissect_ircomm_ttp_lsap(tvbuff_t* tvb, unsigned offset, packet_i
 /*
  * Dissect IrCOMM/IrLPT IAS "IrDA:IrLMP:LsapSel" attribute
  */
-static gboolean dissect_ircomm_lmp_lsap(tvbuff_t* tvb, unsigned offset, packet_info* pinfo,
-                                        proto_tree* tree, unsigned list_index _U_, guint8 attr_type)
+static gboolean dissect_ircomm_lmp_lsap(tvbuff_t* tvb, guint offset, packet_info* pinfo,
+                                        proto_tree* tree, guint list_index _U_, guint8 attr_type)
 {
     guint8 dlsap;
 
@@ -369,7 +369,7 @@ static gboolean dissect_ircomm_lmp_lsap(tvbuff_t* tvb, unsigned offset, packet_i
  */
 void proto_register_ircomm(void)
 {
-    unsigned i;
+    guint i;
 
     /* Setup list of header fields */
     static hf_register_info hf_ircomm[] = {
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index 4c7e459ce3..d89c64bce8 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -427,7 +427,7 @@ static ias_class_dissector_t class_dissector[] = { CLASS_DISSECTORS };
 /*
  * Dissect parameter tuple
  */
-unsigned dissect_param_tuple(tvbuff_t* tvb, proto_tree* tree, unsigned offset)
+guint dissect_param_tuple(tvbuff_t* tvb, proto_tree* tree, guint offset)
 {
     guint8  len = tvb_get_guint8(tvb, offset + 1);
 
@@ -453,9 +453,9 @@ unsigned dissect_param_tuple(tvbuff_t* tvb, proto_tree* tree, unsigned offset)
 /*
  * Dissect TTP
  */
-static unsigned dissect_ttp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, gboolean data)
+static guint dissect_ttp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, gboolean data)
 {
-    unsigned    offset = 0;
+    guint    offset = 0;
     guint8      head;
 	char		buf[128];
 
@@ -502,7 +502,7 @@ static unsigned dissect_ttp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root,
  */
 static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root)
 {
-    unsigned            offset = 0;
+    guint            offset = 0;
     guint8              op;
     guint8              clen = 0;
     guint8              alen = 0;
@@ -654,10 +654,10 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r
  */
 static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root)
 {
-    unsigned            offset = 0;
-    unsigned            len    = tvb_length(tvb);
-    unsigned            n      = 0;
-    unsigned            list_len;
+    guint            offset = 0;
+    guint            len    = tvb_length(tvb);
+    guint            n      = 0;
+    guint            list_len;
     guint8              op;
     guint8              retcode;
     guint8              type;
@@ -907,7 +907,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro
 /*
  * Check if IAP result is octet sequence
  */
-gboolean check_iap_octet_result(tvbuff_t* tvb, proto_tree* tree, unsigned offset,
+gboolean check_iap_octet_result(tvbuff_t* tvb, proto_tree* tree, guint offset,
                                 const char* attr_name, guint8 attr_type)
 {
     if (attr_type != IAS_OCT_SEQ)
@@ -929,7 +929,7 @@ gboolean check_iap_octet_result(tvbuff_t* tvb, proto_tree* tree, unsigned offset
 /*
  * Check if IAP result is correct LsapSel
  */
-guint8 check_iap_lsap_result(tvbuff_t* tvb, proto_tree* tree, unsigned offset,
+guint8 check_iap_lsap_result(tvbuff_t* tvb, proto_tree* tree, guint offset,
                              const char* attr_name, guint8 attr_type)
 {
     guint32 lsap;
@@ -957,7 +957,7 @@ guint8 check_iap_lsap_result(tvbuff_t* tvb, proto_tree* tree, unsigned offset,
  */
 static void dissect_appl_proto(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pdu_type_t pdu_type)
 {
-    unsigned            offset = 0;
+    guint            offset = 0;
     guint8              src;
     address             srcaddr;
     address             destaddr;
@@ -1027,7 +1027,7 @@ static void dissect_appl_proto(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro
  */
 static void dissect_irlmp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root)
 {
-    unsigned    offset = 0;
+    guint    offset = 0;
     guint8      dlsap;
     guint8      slsap;
     guint8      cbit;
@@ -1250,9 +1250,9 @@ void add_lmp_conversation(packet_info* pinfo, guint8 dlsap, gboolean ttp, dissec
 /*
  * Dissect Negotiation Parameters
  */
-static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned offset)
+static guint dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, guint offset)
 {
-    unsigned    n   = 0;
+    guint    n   = 0;
     proto_item* ti;
     proto_tree* p_tree;
     char        buf[256];
@@ -1527,7 +1527,7 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro
 
     if (tvb_reported_length_remaining(tvb, offset) > 0)
     {
-        unsigned    hints_len;
+        guint    hints_len;
         guint8      hint1 = 0;
         guint8      hint2 = 0;
         char buf[23];
@@ -1879,7 +1879,7 @@ static void dissect_irda(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root)
  */
 void proto_register_irda(void)
 {
-    unsigned i;
+    guint i;
 
     /* Setup list of header fields */
     static hf_register_info hf_lap[] = {
diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c
index 26819edd97..8813ec73b5 100644
--- a/plugins/irda/packet-sir.c
+++ b/plugins/irda/packet-sir.c
@@ -148,7 +148,7 @@ dissect_sir(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root)
 				data_offset, eof_offset - data_offset, -1);
 			next_tvb = unescape_data(next_tvb, pinfo);
 			if (root) {
-				unsigned data_len = tvb_length(next_tvb) < 2 ? 0 :
+				guint data_len = tvb_length(next_tvb) < 2 ? 0 :
 					tvb_length(next_tvb) - 2;
 				proto_tree* ti = proto_tree_add_protocol_format(root,
 						proto_sir, tvb, offset, eof_offset - offset + 1,