aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2004-01-05 19:31:44 +0000
committerUlf Lamping <ulf.lamping@web.de>2004-01-05 19:31:44 +0000
commit0d9679de8dd6536bf1d0c9664489f4c35b1e6270 (patch)
tree4bbb164018cdeecf66dacbbe39d03b005ddbcfa2 /plugins
parentba3b94790d2d639559ef75632d0e92a9d040f0d7 (diff)
removed some MSVC warnings (level 3)
svn path=/trunk/; revision=9561
Diffstat (limited to 'plugins')
-rw-r--r--plugins/artnet/packet-artnet.c10
-rw-r--r--plugins/docsis/packet-rngrsp.c4
-rw-r--r--plugins/giop/packet-coseventcomm.c2
-rw-r--r--plugins/giop/packet-cosnaming.c2
-rw-r--r--plugins/gryphon/packet-gryphon.c4
5 files changed, 11 insertions, 11 deletions
diff --git a/plugins/artnet/packet-artnet.c b/plugins/artnet/packet-artnet.c
index ec4fcdf223..cde3cd8bd2 100644
--- a/plugins/artnet/packet-artnet.c
+++ b/plugins/artnet/packet-artnet.c
@@ -1,7 +1,7 @@
/* packet-artnet.c
* Routines for Art-Net packet disassembly
*
- * $Id: packet-artnet.c,v 1.5 2003/11/17 20:57:11 guy Exp $
+ * $Id: packet-artnet.c,v 1.6 2004/01/05 19:28:54 ulfl Exp $
*
* Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.com>
*
@@ -997,22 +997,22 @@ dissect_artnet_video_data(tvbuff_t *tvb, guint offset, proto_tree *tree) {
offset, 2, FALSE);
offset += 2;
- pos_x = tvb_get_ntohs(tvb, offset);
+ pos_x = (guint8) tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(tree, hf_artnet_video_data_pos_x, tvb,
offset, 1, pos_x);
offset += 1;
- pos_y = tvb_get_ntohs(tvb, offset);
+ pos_y = (guint8) tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(tree, hf_artnet_video_data_pos_y, tvb,
offset, 1, pos_y);
offset += 1;
- len_x = tvb_get_ntohs(tvb, offset);
+ len_x = (guint8) tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(tree, hf_artnet_video_data_len_x, tvb,
offset, 1, len_x);
offset += 1;
- len_y = tvb_get_ntohs(tvb, offset);
+ len_y = (guint8) tvb_get_ntohs(tvb, offset);
proto_tree_add_uint(tree, hf_artnet_video_data_len_y, tvb,
offset, 1, len_y);
offset += 1;
diff --git a/plugins/docsis/packet-rngrsp.c b/plugins/docsis/packet-rngrsp.c
index 24dbb53f67..d066d45ff4 100644
--- a/plugins/docsis/packet-rngrsp.c
+++ b/plugins/docsis/packet-rngrsp.c
@@ -2,7 +2,7 @@
* Routines for Ranging Response Message dissection
* Copyright 2002, Anand V. Narwani <anand[AT]narwani.org>
*
- * $Id: packet-rngrsp.c,v 1.6 2003/12/13 03:18:38 guy Exp $
+ * $Id: packet-rngrsp.c,v 1.7 2004/01/05 19:28:34 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -86,7 +86,7 @@ byte_to_signed (guint8 i)
{
val = i;
}
- return (val);
+ return (gint8) (val);
}
gint16
diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c
index fc41bfab5e..5b098ab1fc 100644
--- a/plugins/giop/packet-coseventcomm.c
+++ b/plugins/giop/packet-coseventcomm.c
@@ -152,7 +152,7 @@ static const char CosEventComm_PullConsumer_disconnect_pull_consumer_op[] = "dis
static gboolean decode_user_exception(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_ ) {
- gboolean be _U_; /* big endianess */
+ /*gboolean be _U_;*/ /* big endianess */
diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c
index b8e90e935f..43f6c15cd3 100644
--- a/plugins/giop/packet-cosnaming.c
+++ b/plugins/giop/packet-cosnaming.c
@@ -289,7 +289,7 @@ static void decode_ex_CosNaming_NamingContext_CannotProceed(tvbuff_t *tvb _U_, p
static gboolean decode_user_exception(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_ ) {
- gboolean be _U_; /* big endianess */
+ /*gboolean be _U_;*/ /* big endianess */
diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index 785079d696..9ea1d83786 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -3,7 +3,7 @@
* By Steve Limkemann <stevelim@dgtech.com>
* Copyright 1998 Steve Limkemann
*
- * $Id: packet-gryphon.c,v 1.43 2003/11/04 18:37:32 guy Exp $
+ * $Id: packet-gryphon.c,v 1.44 2004/01/05 19:27:50 ulfl Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -919,7 +919,7 @@ resp_time(tvbuff_t *tvb, int offset, proto_tree *pt)
*/
ts.lng[1] = tvb_get_ntohl(tvb, offset);
ts.lng[0] = tvb_get_ntohl(tvb, offset + 4);
- timestamp = ts.lnglng / 100000L;
+ timestamp = (time_t) (ts.lnglng / 100000L);
strncpy (date, ctime(&timestamp), sizeof(date));
date[strlen(date)-1] = 0x00;
proto_tree_add_text(pt, tvb, offset, 8, "Date/Time: %s", date);