aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2003-07-25 04:17:37 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2003-07-25 04:17:37 +0000
commit64a13fd560c8513a56a508c68efc5298e18c2229 (patch)
tree28b2b225bc9745c223d22b4bca97bb7421dd8057
parentc91b8e713ff5568ab53aedff226b01cd4d0adf23 (diff)
Remove some warnings from gcc.
svn path=/trunk/; revision=8085
-rw-r--r--packet-beep.c4
-rw-r--r--packet-enip.c4
-rw-r--r--packet-quake3.c3
-rw-r--r--packet-quakeworld.c3
4 files changed, 7 insertions, 7 deletions
diff --git a/packet-beep.c b/packet-beep.c
index 91e38d8611..ece630ccde 100644
--- a/packet-beep.c
+++ b/packet-beep.c
@@ -1,7 +1,7 @@
/* packet-beep.c
* Routines for BEEP packet disassembly
*
- * $Id: packet-beep.c,v 1.12 2002/11/28 03:57:49 guy Exp $
+ * $Id: packet-beep.c,v 1.13 2003/07/25 04:17:36 gram Exp $
*
* Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
* Modified 2001 Darren New <dnew@invisible.net> for BEEP.
@@ -271,6 +271,7 @@ dissect_beep_more(tvbuff_t *tvb, int offset,
}
+#if 0
static void dissect_beep_status(tvbuff_t *tvb, int offset,
proto_tree *tree)
{
@@ -304,6 +305,7 @@ static void dissect_beep_status(tvbuff_t *tvb, int offset,
}
}
+#endif
static int num_len(tvbuff_t *tvb, int offset)
{
diff --git a/packet-enip.c b/packet-enip.c
index a442c263ca..aefdf3a6e0 100644
--- a/packet-enip.c
+++ b/packet-enip.c
@@ -6,7 +6,7 @@
* Magnus Hansson <mah@hms.se>
* Joakim Wiberg <jow@hms.se>
*
- * $Id: packet-enip.c,v 1.2 2003/06/12 07:33:26 guy Exp $
+ * $Id: packet-enip.c,v 1.3 2003/07/25 04:17:36 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1797,7 +1797,7 @@ show_cdf( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset )
{
temp_char = tvb_get_guint8( tvb, offset+10+i );
- if( temp_char == NULL )
+ if( temp_char == '\0' )
break;
proto_item_append_text(temp_item, "%c", temp_char );
diff --git a/packet-quake3.c b/packet-quake3.c
index 1255e581c5..f6de4e321d 100644
--- a/packet-quake3.c
+++ b/packet-quake3.c
@@ -3,7 +3,7 @@
*
* Uwe Girlich <uwe@planetquake.com>
*
- * $Id: packet-quake3.c,v 1.15 2003/05/19 03:23:11 gerald Exp $
+ * $Id: packet-quake3.c,v 1.16 2003/07/25 04:17:37 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -149,7 +149,6 @@ dissect_quake3_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo _U_,
proto_item *text_item = NULL;
proto_tree *text_tree = NULL;
guint8 text[2048];
- int maxbufsize = 0;
int len;
int offset;
guint32 marker;
diff --git a/packet-quakeworld.c b/packet-quakeworld.c
index b10ef58348..4346a930a1 100644
--- a/packet-quakeworld.c
+++ b/packet-quakeworld.c
@@ -4,7 +4,7 @@
* Uwe Girlich <uwe@planetquake.com>
* http://www.idsoftware.com/q1source/q1source.zip
*
- * $Id: packet-quakeworld.c,v 1.17 2003/05/19 03:23:11 gerald Exp $
+ * $Id: packet-quakeworld.c,v 1.18 2003/07/25 04:17:37 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -360,7 +360,6 @@ dissect_quakeworld_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo,
proto_item *text_item = NULL;
proto_tree *text_tree = NULL;
guint8 text[MAX_TEXT_SIZE+1];
- int maxbufsize = 0;
int len;
int offset;
guint32 marker;