summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk/rtp_analysis.c10
-rw-r--r--packet-bssgp.c4
-rw-r--r--packet-dcerpc-rpriv.c4
-rw-r--r--packet-dcerpc-rs_repadm.c4
-rw-r--r--packet-giop.c8
-rw-r--r--packet-ldp.c6
-rw-r--r--packet-rpc.c4
-rw-r--r--packet-smb.c6
-rw-r--r--packet-teredo.c4
-rw-r--r--wiretap/lanalyzer.c6
10 files changed, 28 insertions, 28 deletions
diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index 72966f0853..eba7d33d37 100644
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -1,7 +1,7 @@
/* rtp_analysis.c
* RTP analysis addition for ethereal
*
- * $Id: rtp_analysis.c,v 1.15 2003/12/17 22:13:07 guy Exp $
+ * $Id: rtp_analysis.c,v 1.16 2003/12/28 12:43:40 ulfl Exp $
*
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
@@ -1161,12 +1161,12 @@ static gboolean copy_file(gchar *dest, gint channels, /*gint format,*/ user_data
/* since conversation in one way can start later than in the other one,
* we have to write some silence information for one channel */
if (user_data->forward.statinfo.start_time > user_data->reversed.statinfo.start_time) {
- f_write_silence =
- (user_data->forward.statinfo.start_time-user_data->reversed.statinfo.start_time)*8000;
+ f_write_silence = (guint32)
+ ((user_data->forward.statinfo.start_time-user_data->reversed.statinfo.start_time)*8000);
}
else if (user_data->forward.statinfo.start_time < user_data->reversed.statinfo.start_time) {
- r_write_silence =
- (user_data->reversed.statinfo.start_time-user_data->forward.statinfo.start_time)*8000;
+ r_write_silence = (guint32)
+ ((user_data->reversed.statinfo.start_time-user_data->forward.statinfo.start_time)*8000);
}
for(;;) {
if(stop_flag)
diff --git a/packet-bssgp.c b/packet-bssgp.c
index dbe324e65a..4e48ae9bfd 100644
--- a/packet-bssgp.c
+++ b/packet-bssgp.c
@@ -2,7 +2,7 @@
* Routines for BSSGP (BSS GPRS Protocol ETSI GSM 08.18 version 6.7.1 TS 101 343 ) dissection
* Copyright 2000, Josef Korelus <jkor@quick.cz>
*
- * $Id: packet-bssgp.c,v 1.7 2003/11/09 22:13:18 guy Exp $
+ * $Id: packet-bssgp.c,v 1.8 2003/12/28 12:43:38 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1177,7 +1177,7 @@ static int dcd_bssgp_pdu_life(tvbuff_t *tvb, int offset, dec_fu_param_stru_t *dp
proto_tree_add_uint_format(lft_tree,hf_bssgp_pdu_lifetime,tvb,offset+2,2,lifetime,"PDU Life time: infinite delay (%#.4x centi seconds)", lifetime);
}
else{
- ms_lifetime = lifetime/100;
+ ms_lifetime = (gfloat) (lifetime/100);
proto_item_append_text(ti,"%f",ms_lifetime);
proto_tree_add_uint_format(lft_tree,hf_bssgp_pdu_lifetime,tvb,offset+2,2,lifetime,"PDU Life time: %fs (%#.4x centi seconds)", ms_lifetime, lifetime);
}
diff --git a/packet-dcerpc-rpriv.c b/packet-dcerpc-rpriv.c
index 9601b1d632..edc7bb8f82 100644
--- a/packet-dcerpc-rpriv.c
+++ b/packet-dcerpc-rpriv.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rpriv.idl
*
- * $Id: packet-dcerpc-rpriv.c,v 1.6 2003/10/06 08:35:29 guy Exp $
+ * $Id: packet-dcerpc-rpriv.c,v 1.7 2003/12/28 12:43:38 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -56,7 +56,7 @@ static gint ett_rpriv = -1;
static e_uuid_t uuid_rpriv = { 0xb1e338f8, 0x9533, 0x11c9, { 0xa3, 0x4a, 0x08, 0x00, 0x1e, 0x01, 0x9c, 0x1e } };
-static guint16 ver_rpriv = 1.1;
+static guint16 ver_rpriv = (guint16) (1.1);
static int
diff --git a/packet-dcerpc-rs_repadm.c b/packet-dcerpc-rs_repadm.c
index 7d7d0f9088..38cc96d12d 100644
--- a/packet-dcerpc-rs_repadm.c
+++ b/packet-dcerpc-rs_repadm.c
@@ -5,7 +5,7 @@
* This information is based off the released idl files from opengroup.
* ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_repadm.idl
*
- * $Id: packet-dcerpc-rs_repadm.c,v 1.4 2003/08/04 02:49:01 tpot Exp $
+ * $Id: packet-dcerpc-rs_repadm.c,v 1.5 2003/12/28 12:43:38 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -50,7 +50,7 @@ static gint ett_rs_repadm = -1;
static e_uuid_t uuid_rs_repadm = { 0x5b8c2fa8, 0xb60b, 0x11c9, { 0xbe, 0x0f, 0x08, 0x00, 0x1e, 0x01, 0x8f, 0xa0 } };
-static guint16 ver_rs_repadm = 1.1;
+static guint16 ver_rs_repadm = (guint16) (1.1);
diff --git a/packet-giop.c b/packet-giop.c
index 534be6a720..d9704c1499 100644
--- a/packet-giop.c
+++ b/packet-giop.c
@@ -9,7 +9,7 @@
* Frank Singleton <frank.singleton@ericsson.com>
* Trevor Shepherd <eustrsd@am1.ericsson.se>
*
- * $Id: packet-giop.c,v 1.75 2003/12/21 04:31:56 jmayer Exp $
+ * $Id: packet-giop.c,v 1.76 2003/12/28 12:43:38 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -4632,12 +4632,12 @@ static void decode_CodeSets(tvbuff_t *tvb, proto_tree *tree, int *offset,
the beginning of the context_data sequence.
Inside get_CDR_ulong(), the calculation will be (offset +(- boundary)) % 4
to determine the correct alignment of the short. */
- code_set_id = get_CDR_ulong(tvb, offset, stream_is_be, -boundary );
+ code_set_id = get_CDR_ulong(tvb, offset, stream_is_be, -((gint32) boundary) );
proto_tree_add_text (tree, tvb, *offset - 4, 4,
"char_data: 0x%08x", code_set_id);
- code_set_id = get_CDR_ulong(tvb, offset, stream_is_be, -boundary );
+ code_set_id = get_CDR_ulong(tvb, offset, stream_is_be, -((gint32) boundary) );
proto_tree_add_text (tree, tvb, *offset - 4, 4,
"wchar_data: 0x%08x", code_set_id);
@@ -4670,7 +4670,7 @@ static void decode_RTCorbaPriority(tvbuff_t *tvb, proto_tree *tree, int *offset,
the beginning of the context_data sequence.
Inside get_CDR_short(), the calculation will be (offset + (- boundary)) % 2
to determine the correct alignment of the short. */
- rtpriority = get_CDR_short(tvb, offset, stream_is_be, -boundary );
+ rtpriority = get_CDR_short(tvb, offset, stream_is_be, -((gint32) boundary) );
if(tree) {
/* Highlight all of context_data except for the first endian byte */
diff --git a/packet-ldp.c b/packet-ldp.c
index 3234db8b31..9936d6885f 100644
--- a/packet-ldp.c
+++ b/packet-ldp.c
@@ -1,7 +1,7 @@
/* packet-ldp.c
* Routines for LDP (RFC 3036) packet disassembly
*
- * $Id: packet-ldp.c,v 1.47 2003/12/04 05:55:45 gram Exp $
+ * $Id: packet-ldp.c,v 1.48 2003/12/28 12:43:38 ulfl Exp $
*
* Copyright (c) November 2000 by Richard Sharpe <rsharpe@ns.aus.com>
*
@@ -2173,7 +2173,7 @@ dissect_ldp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
*/
pinfo->desegment_offset = offset;
pinfo->desegment_len = 4 - length_remaining;
- return -pinfo->desegment_len;
+ return -((gint32) pinfo->desegment_len);
}
}
@@ -2201,7 +2201,7 @@ dissect_ldp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
pinfo->desegment_offset = offset;
pinfo->desegment_len =
(plen + 4) - length_remaining;
- return -pinfo->desegment_len;
+ return -((gint32) pinfo->desegment_len);
}
}
diff --git a/packet-rpc.c b/packet-rpc.c
index ea19cd0a04..2daadabaf2 100644
--- a/packet-rpc.c
+++ b/packet-rpc.c
@@ -2,7 +2,7 @@
* Routines for rpc dissection
* Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
*
- * $Id: packet-rpc.c,v 1.139 2003/11/16 23:17:20 guy Exp $
+ * $Id: packet-rpc.c,v 1.140 2003/12/28 12:43:38 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -2814,7 +2814,7 @@ dissect_rpc_fragment(tvbuff_t *tvb, int offset, packet_info *pinfo,
else {
pinfo->desegment_offset = offset;
pinfo->desegment_len = len - seglen;
- return -pinfo->desegment_len;
+ return -((gint32) pinfo->desegment_len);
}
}
}
diff --git a/packet-smb.c b/packet-smb.c
index eec564cd96..f976f8a3aa 100644
--- a/packet-smb.c
+++ b/packet-smb.c
@@ -3,7 +3,7 @@
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
* 2001 Rewrite by Ronnie Sahlberg and Guy Harris
*
- * $Id: packet-smb.c,v 1.379 2003/12/18 00:18:54 guy Exp $
+ * $Id: packet-smb.c,v 1.380 2003/12/28 12:43:38 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1255,8 +1255,8 @@ nt_time_to_nstime(guint32 filetime_high, guint32 filetime_low, nstime_t *tv)
/*
* Get the time as seconds and nanoseconds.
*/
- tv->secs = d;
- tv->nsecs = (d - tv->secs)*1000000000;
+ tv->secs = (time_t) d;
+ tv->nsecs = (int) ((d - tv->secs)*1000000000);
return TRUE;
}
diff --git a/packet-teredo.c b/packet-teredo.c
index 2107270fa1..cd3588b4d4 100644
--- a/packet-teredo.c
+++ b/packet-teredo.c
@@ -6,7 +6,7 @@
* Copyright 2003, Ragi BEJJANI - 6WIND - <ragi.bejjani@6wind.com>
* Copyright 2003, Vincent JARDIN - 6WIND - <vincent.jardin@6wind.com>
*
- * $Id: packet-teredo.c,v 1.2 2003/09/10 19:23:29 guy Exp $
+ * $Id: packet-teredo.c,v 1.3 2003/12/28 12:43:39 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -125,7 +125,7 @@ dissect_teredo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
teredoh->th_indtyp = teredoh->th_header;
teredoh->th_cidlen = tvb_get_guint8(tvb,offset+2); /*Authentication header octet*/
teredoh->th_authdlen = tvb_get_guint8(tvb,offset+3);
- teredoh->th_nonce = tvb_get_ntohieee_double(tvb, offset+4);
+ teredoh->th_nonce = (guint64) tvb_get_ntohieee_double(tvb, offset+4);
teredoh->th_conf = tvb_get_guint8(tvb,offset+12);
/*Skip over Authentication Header (fixed length-no authentication)*/
diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c
index 6bdeafa360..73adf2f502 100644
--- a/wiretap/lanalyzer.c
+++ b/wiretap/lanalyzer.c
@@ -1,6 +1,6 @@
/* lanalyzer.c
*
- * $Id: lanalyzer.c,v 1.41 2003/12/11 21:23:37 ulfl Exp $
+ * $Id: lanalyzer.c,v 1.42 2003/12/28 12:43:40 ulfl Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -51,7 +51,7 @@ static const gint8 LA_HeaderRegularFake[] = {
};
static const gint8 LA_RxChannelNameFake[] = {
-0x06,0x10,0x80,0x00,0x43,0x68,0x61,0x6e ,0x6e,0x65,0x6c,0x31,0x00,0x43,0x68,0x61,
+0x06,0x10,(gint8)0x80,0x00,0x43,0x68,0x61,0x6e ,0x6e,0x65,0x6c,0x31,0x00,0x43,0x68,0x61,
0x6e,0x6e,0x65,0x6c,0x32,0x00,0x43,0x68 ,0x61,0x6e,0x6e,0x65,0x6c,0x33,0x00,0x43,
0x68,0x61,0x6e,0x6e,0x65,0x6c,0x34,0x00 ,0x43,0x68,0x61,0x6e,0x6e,0x65,0x6c,0x35,
0x00,0x43,0x68,0x61,0x6e,0x6e,0x65,0x6c ,0x36,0x00,0x43,0x68,0x61,0x6e,0x6e,0x65,
@@ -71,7 +71,7 @@ static const gint8 LA_TxChannelNameFake[] = {
static const gint8 LA_RxTemplateNameFake[] = {
0x35,0x10,
-0x90,0x00,0x00,0x00,0x00,0x00,0x00,0x00 ,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+(gint8)0x90,0x00,0x00,0x00,0x00,0x00,0x00,0x00 ,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 ,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 ,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 ,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-05 03:40:29 +0000