diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2017-03-19 20:32:20 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-03-19 22:53:57 +0000 |
| commit | e94bd9b4eeeb882c83b0c1624e9f63b77e9c3d5d (patch) | |
| tree | dfac580bcd5e10b8dc1d70dc1b2faef37e9b6113 /epan/ftypes/ftypes.c | |
| parent | 2a3473820da5834b7d3732a3c6e314245839a673 (diff) | |
| download | wireshark-e94bd9b4eeeb882c83b0c1624e9f63b77e9c3d5d.tar.gz | |
ftypes: move get_value_sinteger into the union
Delete get_value_sinteger from struct _ftype_t, make it
part of the get_value union.
Change-Id: I3127252cafc62389ce426639992f1d59f7ac9731
Reviewed-on: https://code.wireshark.org/review/20637
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
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 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/ftypes/ftypes.c b/epan/ftypes/ftypes.c index 5c2fafb200..8a0b4df387 100644 --- a/epan/ftypes/ftypes.c +++ b/epan/ftypes/ftypes.c @@ -633,8 +633,12 @@ fvalue_get_uinteger(fvalue_t *fv) gint32 fvalue_get_sinteger(fvalue_t *fv) { - g_assert(fv->ftype->get_value_sinteger); - return fv->ftype->get_value_sinteger(fv); + g_assert(fv->ftype->ftype == FT_INT8 || + fv->ftype->ftype == FT_INT16 || + fv->ftype->ftype == FT_INT24 || + fv->ftype->ftype == FT_INT32); + g_assert(fv->ftype->get_value.get_value_sinteger); + return fv->ftype->get_value.get_value_sinteger(fv); } guint64 |