osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

explicitly use 64bit variables, g(u)int is not 64bit everywhere 

svn path=/trunk/; revision=50042
This commit is contained in:
Martin Kaiser 2013-06-19 17:51:59 +00:00
parent 451e4b878b
commit df74ddb9e3
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
epan/dissectors/packet-mp4.c
View File

@ -124,11 +124,11 @@ static const value_string box_types[] = {
{ 0, NULL } { 0, NULL }
}; };
static int static guint64
dissect_mp4_mvhd_body(tvbuff_t *tvb, guint offset, guint len _U_, dissect_mp4_mvhd_body(tvbuff_t *tvb, guint64 offset, guint64 len _U_,
packet_info *pinfo _U_, proto_tree *tree) packet_info *pinfo _U_, proto_tree *tree)
{ {
guint offset_start; guint64 offset_start;
offset_start = offset; offset_start = offset;
proto_tree_add_item(tree, hf_mp4_full_box_ver, proto_tree_add_item(tree, hf_mp4_full_box_ver,
@ -139,11 +139,11 @@ dissect_mp4_mvhd_body(tvbuff_t *tvb, guint offset, guint len _U_,
return offset-offset_start; return offset-offset_start;
} }
static int static guint64
dissect_mp4_mfhd_body(tvbuff_t *tvb, guint offset, guint len _U_, dissect_mp4_mfhd_body(tvbuff_t *tvb, guint64 offset, guint64 len _U_,
packet_info *pinfo _U_, proto_tree *tree) packet_info *pinfo _U_, proto_tree *tree)
{ {
guint offset_start; guint64 offset_start;
offset_start = offset; offset_start = offset;
proto_tree_add_item(tree, hf_mp4_full_box_ver, proto_tree_add_item(tree, hf_mp4_full_box_ver,
@ -159,11 +159,11 @@ dissect_mp4_mfhd_body(tvbuff_t *tvb, guint offset, guint len _U_,
} }
static int static guint64
dissect_mp4_ftyp_body(tvbuff_t *tvb, guint offset, guint len, dissect_mp4_ftyp_body(tvbuff_t *tvb, guint64 offset, guint64 len,
packet_info *pinfo _U_, proto_tree *tree) packet_info *pinfo _U_, proto_tree *tree)
{ {
guint offset_start; guint64 offset_start;
offset_start = offset; offset_start = offset;
proto_tree_add_item(tree, hf_mp4_ftyp_brand, proto_tree_add_item(tree, hf_mp4_ftyp_brand,
@ -185,16 +185,16 @@ dissect_mp4_ftyp_body(tvbuff_t *tvb, guint offset, guint len,
/* dissect a box, return its (standard or extended) length or 0 for error */ /* dissect a box, return its (standard or extended) length or 0 for error */
static guint64 static guint64
dissect_mp4_box(guint32 parent_box_type _U_, dissect_mp4_box(guint32 parent_box_type _U_,
tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) tvbuff_t *tvb, guint64 offset, packet_info *pinfo, proto_tree *tree)
{ {
guint offset_start; guint64 offset_start;
guint64 box_size; guint64 box_size;
guint32 box_type; guint32 box_type;
guint8 *box_type_str; guint8 *box_type_str;
proto_item *type_pi, *size_pi; proto_item *type_pi, *size_pi;
proto_tree *box_tree; proto_tree *box_tree;
guint64 ret; guint64 ret;
guint body_size; guint64 body_size;
offset_start = offset; offset_start = offset;
@ -273,7 +273,7 @@ dissect_mp4_box(guint32 parent_box_type _U_,
static int static int
dissect_mp4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) dissect_mp4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{ {
guint offset = 0; guint64 offset = 0;
guint32 box_type; guint32 box_type;
proto_item *pi; proto_item *pi;
proto_tree *mp4_tree; proto_tree *mp4_tree;
@ -305,7 +305,7 @@ dissect_mp4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
offset += ret; offset += ret;
} }
return offset; return (int)offset;
} }
void void