diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2017-03-09 23:05:18 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-03-10 02:35:21 +0000 |
| commit | 8b11bc7b040862cfa5afd06541fb26829392a43c (patch) | |
| tree | 5aec8ebb1758bdac11dab52027ec032add7cb6e1 /epan/ftypes/ftypes.c | |
| parent | 3bcda66971e7eff1bca5155207cb035e185dc6d0 (diff) | |
| download | wireshark-8b11bc7b040862cfa5afd06541fb26829392a43c.tar.gz | |
ftypes: move set_value_protocol into the union
Delete set_value_protocol from struct _ftype_t, make it part of the
set_value union.
Change-Id: Iae55388b8a2c965944028499619282c3232c31f3
Reviewed-on: https://code.wireshark.org/review/20475
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/ftypes/ftypes.c')
| -rw-r--r-- | epan/ftypes/ftypes.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/ftypes/ftypes.c b/epan/ftypes/ftypes.c index 21ae24cc04..5117849758 100644 --- a/epan/ftypes/ftypes.c +++ b/epan/ftypes/ftypes.c @@ -549,8 +549,9 @@ fvalue_set_string(fvalue_t *fv, const gchar *value) void fvalue_set_protocol(fvalue_t *fv, tvbuff_t *value, const gchar *name) { - g_assert(fv->ftype->set_value_protocol); - fv->ftype->set_value_protocol(fv, value, name); + g_assert(fv->ftype->ftype == FT_PROTOCOL); + g_assert(fv->ftype->set_value.set_value_protocol); + fv->ftype->set_value.set_value_protocol(fv, value, name); } void |