diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-09 11:45:35 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-12 00:38:20 +0000 |
| commit | 77686a65a3913840c734b581783e0ca80fcf571e (patch) | |
| tree | 6835dbfdd5827b5c37095ea5d5fcee7157526ea0 | |
| parent | 5823e6e50bad432ff7b6ea6c3c0dc2dc9232b469 (diff) | |
Get rid of a void * in frame_data.
Forward-declare struct _color_filter and use it in struct _frame_data.
Change-Id: I4543206bc71ad1e088b60347e6deb6d87a573b35
Reviewed-on: https://code.wireshark.org/review/10914
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/frame_data.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/frame_data.h b/epan/frame_data.h index 2980b04ca9..b47093e3de 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -61,6 +61,7 @@ typedef enum { /** The frame number is the ordinal number of the frame in the capture, so it's 1-origin. In various contexts, 0 as a frame number means "frame number unknown". */ +struct _color_filter; /* Forward */ DIAG_OFF(pedantic) typedef struct _frame_data { GSList *pfd; /**< Per frame proto data */ @@ -85,7 +86,7 @@ typedef struct _frame_data { } flags; gint16 tsprec; /**< Time stamp precision */ - const void *color_filter; /**< Per-packet matching color_filter_t object */ + const struct _color_filter *color_filter; /**< Per-packet matching color_filter_t object */ nstime_t abs_ts; /**< Absolute timestamp */ nstime_t shift_offset; /**< How much the abs_tm of the frame is shifted */ |