diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-24 17:10:20 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-25 02:24:34 +0000 |
| commit | 099698445b5cd60b00777ae47f68fba620fa975e (patch) | |
| tree | 8c37921e0fa9893dd0c00e3b66f287c4d7d1a78d /epan/frame_data.h | |
| parent | 6beb19af8e86c17d9b2d69bf1cc0b2e24fbc111b (diff) | |
Move the proto data stuff out of frame_data.[ch].
It's not tied to the frame_data structure any more, so it belongs by
itself.
Clean up some #includes while we're at it; in particular, frame_data.h
doesn't use anything related to tvbuffs, so don't have it gratuitiously
include tvbuff.h.
Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c
Reviewed-on: https://code.wireshark.org/review/13518
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/frame_data.h')
| -rw-r--r-- | epan/frame_data.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/epan/frame_data.h b/epan/frame_data.h index 6f10ff9ad3..a282c882fb 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -27,7 +27,6 @@ extern "C" { #endif /* __cplusplus */ -#include <epan/tvbuff.h> #include <wsutil/nstime.h> #include <wsutil/ws_diag_control.h> #include "ws_symbol_export.h" @@ -95,12 +94,6 @@ typedef struct _frame_data { } frame_data; DIAG_ON(pedantic) -/* Utility routines used by packet*.c */ -WS_DLL_PUBLIC void p_add_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key, void *proto_data); -WS_DLL_PUBLIC void *p_get_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key); -WS_DLL_PUBLIC void p_remove_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key); -gchar *p_get_proto_name_and_key(wmem_allocator_t *scope, struct _packet_info* pinfo, guint pfd_index); - /** compare two frame_datas */ WS_DLL_PUBLIC gint frame_data_compare(const struct epan_session *epan, const frame_data *fdata1, const frame_data *fdata2, int field); |