aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2001-03-02 17:17:56 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2001-03-02 17:17:56 +0000
commitcf75b3f6a8d6dce409aacb4fe0e54f1a7db769f8 (patch)
treeeafef3ed7577030c50968996a2e79a1962655178 /epan
parentb24dff17bd782b5258609a38e2251816e28fc127 (diff)
Get rid of unused method from ftypes structure.
svn path=/trunk/; revision=3093
Diffstat (limited to 'epan')
-rw-r--r--epan/ftypes/ftype-bytes.c13
-rw-r--r--epan/ftypes/ftype-double.c12
-rw-r--r--epan/ftypes/ftype-integer.c21
-rw-r--r--epan/ftypes/ftype-ipv4.c12
-rw-r--r--epan/ftypes/ftype-string.c14
-rw-r--r--epan/ftypes/ftype-time.c12
-rw-r--r--epan/ftypes/ftype-tvbuff.c3
-rw-r--r--epan/ftypes/ftypes-int.h4
8 files changed, 8 insertions, 83 deletions
diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c
index 824caf718e..40412a9d7f 100644
--- a/epan/ftypes/ftype-bytes.c
+++ b/epan/ftypes/ftype-bytes.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-bytes.c,v 1.3 2001/02/01 21:52:16 guy Exp $
+ * $Id: ftype-bytes.c,v 1.4 2001/03/02 17:17:56 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -33,14 +33,6 @@
#define ETHER_LEN 6
#define IPv6_LEN 16
-static void
-ftype_from_tvbuff(field_info *fi, tvbuff_t *tvb, int start, int length,
- gboolean little_endian)
-{
- /* XXX */
- g_assert_not_reached();
-}
-
static void
bytes_fvalue_new(fvalue_t *fv)
@@ -324,7 +316,6 @@ ftype_register_bytes(void)
0,
bytes_fvalue_new,
bytes_fvalue_free,
- ftype_from_tvbuff,
val_from_string,
bytes_fvalue_set,
@@ -352,7 +343,6 @@ ftype_register_bytes(void)
ETHER_LEN,
bytes_fvalue_new,
bytes_fvalue_free,
- ftype_from_tvbuff,
ether_from_string,
ether_fvalue_set,
@@ -380,7 +370,6 @@ ftype_register_bytes(void)
IPv6_LEN,
bytes_fvalue_new,
bytes_fvalue_free,
- ftype_from_tvbuff,
ipv6_from_string,
ipv6_fvalue_set,
diff --git a/epan/ftypes/ftype-double.c b/epan/ftypes/ftype-double.c
index 4c6324618c..ba19a8d8e7 100644
--- a/epan/ftypes/ftype-double.c
+++ b/epan/ftypes/ftype-double.c
@@ -1,6 +1,6 @@
/*
*
- * $Id: ftype-double.c,v 1.2 2001/02/01 20:31:21 gram Exp $
+ * $Id: ftype-double.c,v 1.3 2001/03/02 17:17:56 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -32,15 +32,6 @@
#include <errno.h>
static void
-ftype_from_tvbuff(field_info *fi, tvbuff_t *tvb, int start, int length,
- gboolean little_endian)
-{
- /* XXX */
- g_assert_not_reached();
-}
-
-
-static void
double_fvalue_new(fvalue_t *fv)
{
fv->value.floating = 0.0;
@@ -133,7 +124,6 @@ ftype_register_double(void)
0,
double_fvalue_new,
NULL,
- ftype_from_tvbuff,
val_from_string,
NULL,
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index fe341e9034..c2f494722f 100644
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-integer.c,v 1.3 2001/02/11 03:29:53 gram Exp $
+ * $Id: ftype-integer.c,v 1.4 2001/03/02 17:17:56 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -37,15 +37,6 @@
static void
-ftype_from_tvbuff(field_info *fi, tvbuff_t *tvb, int start, int length,
- gboolean little_endian)
-{
- /* XXX */
- g_assert_not_reached();
-}
-
-
-static void
int_fvalue_new(fvalue_t *fv)
{
fv->value.integer = 0;
@@ -216,7 +207,6 @@ ftype_register_integers(void)
1,
int_fvalue_new,
NULL,
- ftype_from_tvbuff,
val_from_string,
NULL,
@@ -240,7 +230,6 @@ ftype_register_integers(void)
2,
int_fvalue_new,
NULL,
- ftype_from_tvbuff,
val_from_string,
NULL,
@@ -264,7 +253,6 @@ ftype_register_integers(void)
3,
int_fvalue_new,
NULL,
- ftype_from_tvbuff,
val_from_string,
NULL,
@@ -288,7 +276,6 @@ ftype_register_integers(void)
4,
int_fvalue_new,
NULL,
- ftype_from_tvbuff,
val_from_string,
NULL,
@@ -312,7 +299,6 @@ ftype_register_integers(void)
1,
int_fvalue_new,
NULL,
- ftype_from_tvbuff,
val_from_string,
NULL,
@@ -336,7 +322,6 @@ ftype_register_integers(void)
2,
int_fvalue_new,
NULL,
- ftype_from_tvbuff,
val_from_string,
NULL,
@@ -360,7 +345,6 @@ ftype_register_integers(void)
3,
int_fvalue_new,
NULL,
- ftype_from_tvbuff,
val_from_string,
NULL,
@@ -384,7 +368,6 @@ ftype_register_integers(void)
4,
int_fvalue_new,
NULL,
- ftype_from_tvbuff,
val_from_string,
NULL,
@@ -408,7 +391,6 @@ ftype_register_integers(void)
0,
boolean_fvalue_new,
NULL,
- ftype_from_tvbuff,
val_from_string,
NULL,
@@ -433,7 +415,6 @@ ftype_register_integers(void)
4,
int_fvalue_new,
NULL,
- ftype_from_tvbuff,
ipxnet_from_string,
NULL,
diff --git a/epan/ftypes/ftype-ipv4.c b/epan/ftypes/ftype-ipv4.c
index 20729e4fdc..cdbf93b1d9 100644
--- a/epan/ftypes/ftype-ipv4.c
+++ b/epan/ftypes/ftype-ipv4.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-ipv4.c,v 1.2 2001/02/01 20:31:21 gram Exp $
+ * $Id: ftype-ipv4.c,v 1.3 2001/03/02 17:17:56 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -29,15 +29,6 @@
#include "ipv4.h"
#include "resolv.h"
-static void
-ftype_from_tvbuff(field_info *fi, tvbuff_t *tvb, int start, int length,
- gboolean little_endian)
-{
- /* XXX */
- g_assert_not_reached();
-}
-
-
static void
set_integer(fvalue_t *fv, guint32 value)
@@ -113,7 +104,6 @@ ftype_register_ipv4(void)
4,
NULL,
NULL,
- ftype_from_tvbuff,
val_from_string,
NULL,
diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c
index 4ec07825a7..2c5189e16f 100644
--- a/epan/ftypes/ftype-string.c
+++ b/epan/ftypes/ftype-string.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-string.c,v 1.2 2001/02/01 20:31:21 gram Exp $
+ * $Id: ftype-string.c,v 1.3 2001/03/02 17:17:56 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -29,15 +29,6 @@
#include <string.h>
static void
-ftype_from_tvbuff(field_info *fi, tvbuff_t *tvb, int start, int length,
- gboolean little_endian)
-{
- /* XXX */
- g_assert_not_reached();
-}
-
-
-static void
string_fvalue_new(fvalue_t *fv)
{
fv->value.string = NULL;
@@ -138,7 +129,6 @@ ftype_register_string(void)
0,
string_fvalue_new,
string_fvalue_free,
- ftype_from_tvbuff,
val_from_string,
string_fvalue_set,
@@ -165,7 +155,6 @@ ftype_register_string(void)
0,
string_fvalue_new,
string_fvalue_free,
- ftype_from_tvbuff,
val_from_string,
string_fvalue_set,
@@ -192,7 +181,6 @@ ftype_register_string(void)
0,
string_fvalue_new,
string_fvalue_free,
- ftype_from_tvbuff,
val_from_string,
string_fvalue_set,
diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c
index 6462b6285a..2d30272110 100644
--- a/epan/ftypes/ftype-time.c
+++ b/epan/ftypes/ftype-time.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-time.c,v 1.2 2001/02/01 20:31:21 gram Exp $
+ * $Id: ftype-time.c,v 1.3 2001/03/02 17:17:56 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -27,14 +27,6 @@
#include <ftypes-int.h>
-static void
-ftype_from_tvbuff(field_info *fi, tvbuff_t *tvb, int start, int length,
- gboolean little_endian)
-{
- /* XXX */
- g_assert_not_reached();
-}
-
static void
time_fvalue_new(fvalue_t *fv)
@@ -66,7 +58,6 @@ ftype_register_time(void)
0,
time_fvalue_new,
NULL,
- ftype_from_tvbuff,
NULL,
time_fvalue_set,
@@ -83,7 +74,6 @@ ftype_register_time(void)
0,
time_fvalue_new,
NULL,
- ftype_from_tvbuff,
NULL,
time_fvalue_set,
diff --git a/epan/ftypes/ftype-tvbuff.c b/epan/ftypes/ftype-tvbuff.c
index c412ab8c62..1df9ef8f71 100644
--- a/epan/ftypes/ftype-tvbuff.c
+++ b/epan/ftypes/ftype-tvbuff.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-tvbuff.c,v 1.3 2001/02/01 23:39:18 gram Exp $
+ * $Id: ftype-tvbuff.c,v 1.4 2001/03/02 17:17:56 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -86,7 +86,6 @@ ftype_register_tvbuff(void)
value_new,
NULL,
NULL,
- NULL,
value_set,
NULL,
diff --git a/epan/ftypes/ftypes-int.h b/epan/ftypes/ftypes-int.h
index 88dcab7d1a..32b4152310 100644
--- a/epan/ftypes/ftypes-int.h
+++ b/epan/ftypes/ftypes-int.h
@@ -1,5 +1,5 @@
/*
- * $Id: ftypes-int.h,v 1.3 2001/02/27 19:23:30 gram Exp $
+ * $Id: ftypes-int.h,v 1.4 2001/03/02 17:17:56 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -27,7 +27,6 @@
#include "packet.h"
#include "ftypes.h"
-typedef void (*FtypeFromTvbuffFunc)(field_info*, tvbuff_t*, int, int, gboolean);
typedef void (*FvalueNewFunc)(fvalue_t*);
typedef void (*FvalueFreeFunc)(fvalue_t*);
@@ -52,7 +51,6 @@ struct _ftype_t {
int wire_size;
FvalueNewFunc new_value;
FvalueFreeFunc free_value;
- FtypeFromTvbuffFunc from_tvbuff;
FvalueFromString val_from_string;
/* could be union */