aboutsummaryrefslogtreecommitdiffstats
path: root/epan/ftypes
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-07-13 00:55:58 +0000
committerGuy Harris <guy@alum.mit.edu>2001-07-13 00:55:58 +0000
commitf7b50ca7544eb3776486375fb15b416a5e88d87b (patch)
tree7296d508f19728911cce7937d426784768575b2e /epan/ftypes
parent82a553e9c9275c9074b087b63e976ef63259dba9 (diff)
From Joerg Mayer:
* gcc 3.0 warning fixes: - text2pcap.c: The number of characters to scan should probably not be 0 - wiretap/csids.c: using preincrement on a variable used on both sides of an assignment might be undefined by the C99(?) standard * turn on additional warnings for epan and wiretap too - epan/configure.in - wiretap/configure.in * Fix some warnings (missing includes, signed/unsigned, missing initializers) found by turning on the warnings - all other files :-) svn path=/trunk/; revision=3709
Diffstat (limited to 'epan/ftypes')
-rw-r--r--epan/ftypes/ftype-double.c5
-rw-r--r--epan/ftypes/ftype-integer.c32
-rw-r--r--epan/ftypes/ftype-ipv4.c5
-rw-r--r--epan/ftypes/ftype-none.c24
-rw-r--r--epan/ftypes/ftype-time.c3
5 files changed, 63 insertions, 6 deletions
diff --git a/epan/ftypes/ftype-double.c b/epan/ftypes/ftype-double.c
index ba19a8d8e7..8fa42e0032 100644
--- a/epan/ftypes/ftype-double.c
+++ b/epan/ftypes/ftype-double.c
@@ -1,6 +1,6 @@
/*
*
- * $Id: ftype-double.c,v 1.3 2001/03/02 17:17:56 gram Exp $
+ * $Id: ftype-double.c,v 1.4 2001/07/13 00:55:56 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -140,6 +140,9 @@ ftype_register_double(void)
cmp_ge,
cmp_lt,
cmp_le,
+
+ NULL,
+ NULL,
};
ftype_register(FT_DOUBLE, &double_type);
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index c0da733cea..fcfd996e97 100644
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-integer.c,v 1.5 2001/03/03 00:33:24 guy Exp $
+ * $Id: ftype-integer.c,v 1.6 2001/07/13 00:55:56 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -232,6 +232,9 @@ ftype_register_integers(void)
u_cmp_ge,
u_cmp_lt,
u_cmp_le,
+
+ NULL,
+ NULL,
};
static ftype_t uint16_type = {
"FT_UINT16",
@@ -255,6 +258,9 @@ ftype_register_integers(void)
u_cmp_ge,
u_cmp_lt,
u_cmp_le,
+
+ NULL,
+ NULL,
};
static ftype_t uint24_type = {
"FT_UINT24",
@@ -278,6 +284,9 @@ ftype_register_integers(void)
u_cmp_ge,
u_cmp_lt,
u_cmp_le,
+
+ NULL,
+ NULL,
};
static ftype_t uint32_type = {
"FT_UINT32",
@@ -301,6 +310,9 @@ ftype_register_integers(void)
u_cmp_ge,
u_cmp_lt,
u_cmp_le,
+
+ NULL,
+ NULL,
};
static ftype_t int8_type = {
"FT_INT8",
@@ -324,6 +336,9 @@ ftype_register_integers(void)
s_cmp_ge,
s_cmp_lt,
s_cmp_le,
+
+ NULL,
+ NULL,
};
static ftype_t int16_type = {
"FT_INT16",
@@ -347,6 +362,9 @@ ftype_register_integers(void)
s_cmp_ge,
s_cmp_lt,
s_cmp_le,
+
+ NULL,
+ NULL,
};
static ftype_t int24_type = {
"FT_INT24",
@@ -370,6 +388,9 @@ ftype_register_integers(void)
s_cmp_ge,
s_cmp_lt,
s_cmp_le,
+
+ NULL,
+ NULL,
};
static ftype_t int32_type = {
"FT_INT32",
@@ -393,6 +414,9 @@ ftype_register_integers(void)
s_cmp_ge,
s_cmp_lt,
s_cmp_le,
+
+ NULL,
+ NULL,
};
static ftype_t boolean_type = {
"FT_BOOLEAN",
@@ -416,6 +440,9 @@ ftype_register_integers(void)
NULL,
NULL,
NULL,
+
+ NULL,
+ NULL,
};
static ftype_t ipxnet_type = {
@@ -440,6 +467,9 @@ ftype_register_integers(void)
u_cmp_ge,
u_cmp_lt,
u_cmp_le,
+
+ NULL,
+ NULL,
};
diff --git a/epan/ftypes/ftype-ipv4.c b/epan/ftypes/ftype-ipv4.c
index 03e8d3a92c..0037923a92 100644
--- a/epan/ftypes/ftype-ipv4.c
+++ b/epan/ftypes/ftype-ipv4.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-ipv4.c,v 1.5 2001/06/23 19:10:27 guy Exp $
+ * $Id: ftype-ipv4.c,v 1.6 2001/07/13 00:55:56 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -180,6 +180,9 @@ ftype_register_ipv4(void)
cmp_ge,
cmp_lt,
cmp_le,
+
+ NULL,
+ NULL,
};
ftype_register(FT_IPv4, &ipv4_type);
diff --git a/epan/ftypes/ftype-none.c b/epan/ftypes/ftype-none.c
index f19b6e2714..09884aeb4a 100644
--- a/epan/ftypes/ftype-none.c
+++ b/epan/ftypes/ftype-none.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-none.c,v 1.2 2001/02/01 20:31:21 gram Exp $
+ * $Id: ftype-none.c,v 1.3 2001/07/13 00:55:56 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -36,7 +36,27 @@ ftype_register_none(void)
"FT_NONE",
"label",
0,
- };
+ NULL,
+ NULL,
+ NULL,
+
+ NULL,
+ NULL,
+ NULL,
+
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+
+ NULL,
+ NULL,
+ };
ftype_register(FT_NONE, &none_type);
}
diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c
index bfaa18a0f5..aeab4c1c8e 100644
--- a/epan/ftypes/ftype-time.c
+++ b/epan/ftypes/ftype-time.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-time.c,v 1.9 2001/06/19 23:08:57 guy Exp $
+ * $Id: ftype-time.c,v 1.10 2001/07/13 00:55:56 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -25,6 +25,7 @@
#endif
#include <ctype.h>
+#include <string.h>
/*
* Just make sure we include the prototype for strptime as well