diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2003-06-11 21:24:54 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2003-06-11 21:24:54 +0000 |
| commit | 6823d063ee7093fed3e512738005f928aac9e88f (patch) | |
| tree | 92253e24d0301a29611b54335a976822da8c47f4 /epan/ftypes/ftype-string.c | |
| parent | 03731079cada7249deea33e72d626599b6213ebb (diff) | |
Expand the ability of fvalue_to_string_repr, and modify more FT_* types
to provide that method.
svn path=/trunk/; revision=7849
Diffstat (limited to 'epan/ftypes/ftype-string.c')
| -rw-r--r-- | epan/ftypes/ftype-string.c | 59 |
1 files changed, 42 insertions, 17 deletions
diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c index 63f508addb..312d1baa02 100644 --- a/epan/ftypes/ftype-string.c +++ b/epan/ftypes/ftype-string.c @@ -1,5 +1,5 @@ /* - * $Id: ftype-string.c,v 1.8 2003/02/08 04:22:37 gram Exp $ + * $Id: ftype-string.c,v 1.9 2003/06/11 21:24:53 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -53,6 +53,31 @@ string_fvalue_set(fvalue_t *fv, gpointer value, gboolean already_copied) } } +static int +string_repr_len(fvalue_t *fv, ftrepr_t rtype) +{ + switch (rtype) { + case FTREPR_DISPLAY: + return strlen(fv->value.string); + case FTREPR_DFILTER: + return strlen(fv->value.string) + 2; + } + g_assert_not_reached(); + return -1; +} + +static void +string_to_repr(fvalue_t *fv, ftrepr_t rtype, char *buf) +{ + if (rtype == FTREPR_DFILTER) { + sprintf(buf, "\"%s\"", fv->value.string); + } + else { + strcpy(buf, fv->value.string); + } +} + + static gpointer value_get(fvalue_t *fv) { @@ -124,22 +149,22 @@ ftype_register_string(void) { static ftype_t string_type = { - "FT_STRING", - "character string", - 0, - string_fvalue_new, - string_fvalue_free, - val_from_string, - NULL, /* val_to_string_repr */ - NULL, /* len_string_repr */ - - string_fvalue_set, - NULL, - NULL, - - value_get, - NULL, - NULL, + "FT_STRING", /* name */ + "character string", /* pretty_name */ + 0, /* wire_size */ + string_fvalue_new, /* new_value */ + string_fvalue_free, /* free_value */ + val_from_string, /* val_from_string */ + string_to_repr, /* val_to_string_repr */ + string_repr_len, /* len_string_repr */ + + string_fvalue_set, /* set_value */ + NULL, /* set_value_integer */ + NULL, /* set_value_floating */ + + value_get, /* get_value */ + NULL, /* get_value_integer */ + NULL, /* get_value_floating */ cmp_eq, cmp_ne, |