prevent MSVC warning:
"warning C4761: Gr��enkonflikt im Argument. Konvertierung vorgenommen" -> size conflict in argument, conversion done svn path=/trunk/; revision=9244
This commit is contained in:
Ulf Lamping
parent
95ea01a41a
commit
10e3320115
|
|
@ -1,7 +1,7 @@
|
|||
/* dcerpc_stat.c
|
||||
* dcerpc_stat 2002 Ronnie Sahlberg
|
||||
*
|
||||
* $Id: dcerpc_stat.c,v 1.29 2003/12/04 00:45:37 guy Exp $
|
||||
* $Id: dcerpc_stat.c,v 1.30 2003/12/11 21:23:36 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -217,14 +217,14 @@ gtk_dcerpcstat_init(char *optarg)
|
|||
|
||||
|
||||
rs=g_malloc(sizeof(rpcstat_t));
|
||||
rs->prog=dcerpc_get_proto_name(&uuid, (minor<<8)|(major&0xff) );
|
||||
hf_opnum=dcerpc_get_proto_hf_opnum(&uuid, (minor<<8)|(major&0xff) );
|
||||
rs->prog=dcerpc_get_proto_name(&uuid, (guint16) ((minor<<8)|(major&0xff)) );
|
||||
hf_opnum=dcerpc_get_proto_hf_opnum(&uuid, (guint16) ((minor<<8)|(major&0xff)) );
|
||||
if(!rs->prog){
|
||||
g_free(rs);
|
||||
fprintf(stderr,"ethereal: dcerpcstat_init() Protocol with uuid:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x v%d.%d not supported\n",uuid.Data1,uuid.Data2,uuid.Data3,uuid.Data4[0],uuid.Data4[1],uuid.Data4[2],uuid.Data4[3],uuid.Data4[4],uuid.Data4[5],uuid.Data4[6],uuid.Data4[7],major,minor);
|
||||
exit(1);
|
||||
}
|
||||
procs=dcerpc_get_proto_sub_dissector(&uuid, (minor<<8)|(major&0xff) );
|
||||
procs=dcerpc_get_proto_sub_dissector(&uuid, (guint16) ((minor<<8)|(major&0xff)) );
|
||||
rs->uuid=uuid;
|
||||
rs->ver=(minor<<8)|(major&0xff);
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for afp packet dissection
|
||||
* Copyright 2002, Didier Gautheron <dgautheron@magic.fr>
|
||||
*
|
||||
* $Id: packet-afp.c,v 1.33 2003/12/08 20:36:40 guy Exp $
|
||||
* $Id: packet-afp.c,v 1.34 2003/12/11 21:23:36 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -1779,7 +1779,7 @@ dissect_query_afp_open_fork(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
static gint
|
||||
dissect_reply_afp_open_fork(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset)
|
||||
{
|
||||
int f_bitmap;
|
||||
guint16 f_bitmap;
|
||||
|
||||
f_bitmap = decode_file_bitmap(tree, tvb, offset);
|
||||
offset += 2;
|
||||
|
|
@ -1980,7 +1980,7 @@ catsearch_spec(tvbuff_t *tvb, proto_tree *ptree, gint offset, int ext, guint32 b
|
|||
PAD(1);
|
||||
}
|
||||
|
||||
offset = parse_file_bitmap(tree, tvb, offset, bitmap,0);
|
||||
offset = parse_file_bitmap(tree, tvb, offset, (guint16) bitmap,0);
|
||||
offset = org +size;
|
||||
|
||||
return offset;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>
|
||||
* In association with Telos Technology Inc.
|
||||
*
|
||||
* $Id: packet-bssap.c,v 1.5 2003/12/02 02:58:32 guy Exp $
|
||||
* $Id: packet-bssap.c,v 1.6 2003/12/11 21:23:36 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -237,11 +237,11 @@ dissect_bssap_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bssap_tre
|
|||
switch (parameter_type)
|
||||
{
|
||||
case PARAMETER_DLCI:
|
||||
dissect_bssap_dlci_param(parameter_tvb, bssap_tree, parameter_length);
|
||||
dissect_bssap_dlci_param(parameter_tvb, bssap_tree, (guint8) parameter_length);
|
||||
break;
|
||||
|
||||
case PARAMETER_LENGTH:
|
||||
dissect_bssap_length_param(parameter_tvb, bssap_tree, parameter_length);
|
||||
dissect_bssap_length_param(parameter_tvb, bssap_tree, (guint8) parameter_length);
|
||||
break;
|
||||
|
||||
case PARAMETER_DATA:
|
||||
|
|
@ -308,7 +308,7 @@ dissect_bssap_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bssap_tree,
|
|||
LENGTH_LENGTH);
|
||||
offset += dissect_bssap_var_parameter(tvb, pinfo, bssap_tree, tree,
|
||||
PARAMETER_DATA,
|
||||
(offset - LENGTH_LENGTH));
|
||||
(guint8) (offset - LENGTH_LENGTH));
|
||||
break;
|
||||
|
||||
case BSSAP_PDU_TYPE_DTAP:
|
||||
|
|
@ -320,7 +320,7 @@ dissect_bssap_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bssap_tree,
|
|||
LENGTH_LENGTH);
|
||||
offset += dissect_bssap_var_parameter(tvb, pinfo, bssap_tree, tree,
|
||||
PARAMETER_DATA,
|
||||
(offset - LENGTH_LENGTH));
|
||||
(guint8) (offset - LENGTH_LENGTH));
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
|
||||
*
|
||||
* $Id: packet-cops.c,v 1.36 2003/10/05 23:09:59 jmayer Exp $
|
||||
* $Id: packet-cops.c,v 1.37 2003/12/11 21:23:36 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -641,7 +641,7 @@ static int dissect_cops_object(tvbuff_t *tvb, guint32 offset, proto_tree *tree)
|
|||
offset++;
|
||||
|
||||
contents_len = object_len - COPS_OBJECT_HDR_SIZE;
|
||||
dissect_cops_object_data(tvb, offset, obj_tree, c_num, c_type, contents_len);
|
||||
dissect_cops_object_data(tvb, offset, obj_tree, c_num, c_type, (guint16) contents_len);
|
||||
|
||||
/* Pad to 32bit boundary */
|
||||
if (object_len % sizeof (guint32))
|
||||
|
|
@ -695,7 +695,7 @@ static void dissect_cops_pr_objects(tvbuff_t *tvb, guint32 offset, proto_tree *t
|
|||
pr_len--;
|
||||
|
||||
contents_len = object_len - COPS_OBJECT_HDR_SIZE;
|
||||
ret = dissect_cops_pr_object_data(tvb, offset, obj_tree, s_num, s_type, contents_len);
|
||||
ret = dissect_cops_pr_object_data(tvb, offset, obj_tree, s_num, s_type, (guint16) contents_len);
|
||||
if (ret < 0)
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for ISO/OSI End System to Intermediate System
|
||||
* Routing Exchange Protocol ISO 9542.
|
||||
*
|
||||
* $Id: packet-esis.c,v 1.28 2003/02/25 19:07:07 guy Exp $
|
||||
* $Id: packet-esis.c,v 1.29 2003/12/11 21:23:36 ulfl Exp $
|
||||
* Ralf Schneider <Ralf.Schneider@t-online.de>
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
|
|
@ -369,13 +369,13 @@ dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
|
|||
|
||||
switch (ehdr.esis_type & OSI_PDU_TYPE_MASK) {
|
||||
case ESIS_ESH_PDU:
|
||||
esis_dissect_esh_pdu( variable_len, tvb, esis_tree);
|
||||
esis_dissect_esh_pdu( (guchar) variable_len, tvb, esis_tree);
|
||||
break;
|
||||
case ESIS_ISH_PDU:
|
||||
esis_dissect_ish_pdu( variable_len, tvb, esis_tree);
|
||||
esis_dissect_ish_pdu( (guchar) variable_len, tvb, esis_tree);
|
||||
break;
|
||||
case ESIS_RD_PDU:
|
||||
esis_dissect_redirect_pdu( variable_len, tvb, esis_tree);
|
||||
esis_dissect_redirect_pdu( (guchar) variable_len, tvb, esis_tree);
|
||||
break;
|
||||
default:
|
||||
esis_dissect_unknown(tvb, esis_tree,
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* Technical realization of Short Message Service (SMS)
|
||||
* (3GPP TS 23.040 version 5.4.0 Release 5)
|
||||
*
|
||||
* $Id: packet-gsm_sms.c,v 1.5 2003/12/08 23:40:13 guy Exp $
|
||||
* $Id: packet-gsm_sms.c,v 1.6 2003/12/11 21:23:36 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -1533,7 +1533,7 @@ char_unicode_decode(unsigned char* dest, const unsigned char* src, int len)
|
|||
|
||||
for (i = 0; i < len / 2; i++)
|
||||
{
|
||||
length = char_uni_alphabet_decode((src[i * 2] << 8) | src[(i * 2) + 1], dest);
|
||||
length = char_uni_alphabet_decode( (wchar_t) ((src[i * 2] << 8) | src[(i * 2) + 1]), dest);
|
||||
dest += length;
|
||||
pos += length;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* for ISAKMP (RFC 2407)
|
||||
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
|
||||
*
|
||||
* $Id: packet-isakmp.c,v 1.76 2003/12/10 19:21:15 guy Exp $
|
||||
* $Id: packet-isakmp.c,v 1.77 2003/12/11 21:23:36 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -751,7 +751,7 @@ dissect_transform(tvbuff_t *tvb, int offset, int length, proto_tree *tree,
|
|||
proto_tree_add_text(tree, tvb, offset, 4,
|
||||
"%s (%u): %s (%u)",
|
||||
str, type,
|
||||
value2str(ike_phase1, type, val), val);
|
||||
value2str(ike_phase1, type, (guint16) val), val);
|
||||
offset += 4;
|
||||
length -= 4;
|
||||
}
|
||||
|
|
@ -766,7 +766,7 @@ dissect_transform(tvbuff_t *tvb, int offset, int length, proto_tree *tree,
|
|||
proto_tree_add_text(tree, tvb, offset, pack_len,
|
||||
"%s (%u): %s (%u)",
|
||||
str, type,
|
||||
value2str(ike_phase1, type, val), val);
|
||||
value2str(ike_phase1, type, (guint16) val), val);
|
||||
}
|
||||
offset += pack_len;
|
||||
length -= pack_len;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
* ISO 10589 ISIS (Intradomain Routing Information Exchange Protocol)
|
||||
* ISO 9542 ESIS (End System To Intermediate System Routing Exchange Protocol)
|
||||
*
|
||||
* $Id: packet-osi-options.c,v 1.14 2002/08/28 21:00:24 jmayer Exp $
|
||||
* $Id: packet-osi-options.c,v 1.15 2003/12/11 21:23:36 ulfl Exp $
|
||||
* Ralf Schneider <Ralf.Schneider@t-online.de>
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
|
|
@ -372,8 +372,8 @@ dissect_osi_options( guchar opt_len, tvbuff_t *tvb,
|
|||
switch ( parm_type ) {
|
||||
case OSI_OPT_QOS_MAINTANANCE:
|
||||
octet = tvb_get_guint8(tvb, offset);
|
||||
dissect_option_qos( octet&OSI_OPT_QOS_MASK,
|
||||
octet&OSI_OPT_QOS_SUB_MASK,
|
||||
dissect_option_qos( (guchar) (octet&OSI_OPT_QOS_MASK),
|
||||
(guchar) (octet&OSI_OPT_QOS_SUB_MASK),
|
||||
offset, parm_len, tvb, osi_option_tree );
|
||||
break;
|
||||
case OSI_OPT_SECURITY:
|
||||
|
|
@ -416,12 +416,12 @@ dissect_osi_options( guchar opt_len, tvbuff_t *tvb,
|
|||
case OSI_OPT_SOURCE_ROUTING:
|
||||
case OSI_OPT_RECORD_OF_ROUTE:
|
||||
dissect_option_route( parm_type,
|
||||
offset, parm_len, tvb, osi_option_tree );
|
||||
(guchar) offset, parm_len, tvb, osi_option_tree );
|
||||
break;
|
||||
case OSI_OPT_REASON_OF_DISCARD:
|
||||
dissect_option_rfd( tvb_get_guint8(tvb, offset),
|
||||
tvb_get_guint8(tvb, offset + 1),
|
||||
offset, parm_len, tvb, osi_option_tree );
|
||||
(guchar) offset, parm_len, tvb, osi_option_tree );
|
||||
break;
|
||||
}
|
||||
opt_len -= parm_len + 2;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* Routines to Dissect Appendix C TLV's
|
||||
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
|
||||
*
|
||||
* $Id: packet-tlv.c,v 1.13 2003/10/05 22:38:09 jmayer Exp $
|
||||
* $Id: packet-tlv.c,v 1.14 2003/12/11 21:23:37 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -955,9 +955,9 @@ dissect_sflow (tvbuff_t * tvb, proto_tree * tree, guint16 start, guint16 len,
|
|||
break;
|
||||
default:
|
||||
if (direction == 24)
|
||||
dissect_upstream_sflow (tvb, sflow_tree, pos - 2, length);
|
||||
dissect_upstream_sflow (tvb, sflow_tree, (guint16) (pos - 2), length);
|
||||
else
|
||||
dissect_downstream_sflow (tvb, sflow_tree, pos - 2, length);
|
||||
dissect_downstream_sflow (tvb, sflow_tree, (guint16) (pos - 2), length);
|
||||
break;
|
||||
|
||||
} /* switch (type) */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for Vendor Specific Encodings dissection
|
||||
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
|
||||
*
|
||||
* $Id: packet-vendor.c,v 1.3 2003/07/19 02:11:34 guy Exp $
|
||||
* $Id: packet-vendor.c,v 1.4 2003/12/11 21:23:37 ulfl Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -144,7 +144,7 @@ dissect_vsif (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
|
|||
{
|
||||
case VENDOR_CISCO:
|
||||
proto_item_append_text (it, " (Cisco)");
|
||||
dissect_cisco (tvb, vsif_tree, vsif_len);
|
||||
dissect_cisco (tvb, vsif_tree, (guint8) vsif_len);
|
||||
break;
|
||||
default:
|
||||
proto_item_append_text (it, " (Unknown)");
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: erf.c,v 1.4 2003/10/01 07:11:46 guy Exp $
|
||||
* $Id: erf.c,v 1.5 2003/12/11 21:23:37 ulfl Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -203,7 +203,7 @@ int erf_open(wtap *wth, int *err)
|
|||
wth->file_encap =
|
||||
(common_type < 0
|
||||
? WTAP_ENCAP_PER_PACKET
|
||||
: erf_encap_to_wtap_encap(wth->capture.erf, common_type));
|
||||
: erf_encap_to_wtap_encap(wth->capture.erf, (guint8) common_type));
|
||||
|
||||
wth->subtype_read = erf_read;
|
||||
wth->subtype_seek_read = erf_seek_read;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* lanalyzer.c
|
||||
*
|
||||
* $Id: lanalyzer.c,v 1.40 2003/10/01 07:11:47 guy Exp $
|
||||
* $Id: lanalyzer.c,v 1.41 2003/12/11 21:23:37 ulfl Exp $
|
||||
*
|
||||
* Wiretap Library
|
||||
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
||||
|
|
@ -742,49 +742,49 @@ static gboolean lanalyzer_dump_header(wtap_dumper *wdh, int *err)
|
|||
*err = s16write(htoles(SummarySize), wdh->fh); /* rlen */
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s8write(fT->tm_mday, wdh->fh); /* s.datcre.day */
|
||||
*err = s8write((guint8) fT->tm_mday, wdh->fh); /* s.datcre.day */
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s8write(fT->tm_mon+1, wdh->fh); /* s.datcre.mon */
|
||||
*err = s8write((guint8) (fT->tm_mon+1), wdh->fh); /* s.datcre.mon */
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s16write(htoles(fT->tm_year + 1900), wdh->fh);/* s.datcre.year */
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s8write(fT->tm_mday, wdh->fh); /* s.datclo.day */
|
||||
*err = s8write((guint8) fT->tm_mday, wdh->fh); /* s.datclo.day */
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s8write(fT->tm_mon+1, wdh->fh); /* s.datclo.mon */
|
||||
*err = s8write((guint8) (fT->tm_mon+1), wdh->fh); /* s.datclo.mon */
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s16write(htoles(fT->tm_year + 1900), wdh->fh);/* s.datclo.year */
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s8write(fT->tm_sec, wdh->fh); /* s.timeopn.second */
|
||||
*err = s8write((guint8) fT->tm_sec, wdh->fh); /* s.timeopn.second */
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s8write(fT->tm_min, wdh->fh); /* s.timeopn.minute */
|
||||
*err = s8write((guint8) fT->tm_min, wdh->fh); /* s.timeopn.minute */
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s8write(fT->tm_hour, wdh->fh); /* s.timeopn.hour */
|
||||
*err = s8write((guint8) fT->tm_hour, wdh->fh); /* s.timeopn.hour */
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s8write(fT->tm_mday, wdh->fh); /* s.timeopn.mday */
|
||||
*err = s8write((guint8) fT->tm_mday, wdh->fh); /* s.timeopn.mday */
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s0write(2, wdh->fh);
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s8write(fT->tm_sec, wdh->fh); /* s.timeclo.second */
|
||||
*err = s8write((guint8) fT->tm_sec, wdh->fh); /* s.timeclo.second */
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s8write(fT->tm_min, wdh->fh); /* s.timeclo.minute */
|
||||
*err = s8write((guint8) fT->tm_min, wdh->fh); /* s.timeclo.minute */
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s8write(fT->tm_hour, wdh->fh); /* s.timeclo.hour */
|
||||
*err = s8write((guint8) fT->tm_hour, wdh->fh); /* s.timeclo.hour */
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s8write(fT->tm_mday, wdh->fh); /* s.timeclo.mday */
|
||||
*err = s8write((guint8) fT->tm_mday, wdh->fh); /* s.timeclo.mday */
|
||||
if (*err)
|
||||
return FALSE;
|
||||
*err = s0write(2, wdh->fh);
|
||||
|
|
|
|||
Loading…
Reference in New Issue