diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-31 20:01:53 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-31 20:01:53 +0000 |
| commit | a2a20ed62abdb61fa0398365aee9ccf1179ea544 (patch) | |
| tree | a52fd8f07abb8bd51b273102ec6c9d4225e37e05 | |
| parent | 9d519b5659aa8c0c4aa984bc6169909eb31be7d6 (diff) | |
Move tvbuff composite structure to their own file.
svn path=/trunk/; revision=51072
| -rw-r--r-- | epan/tvbuff-int.h | 17 | ||||
| -rw-r--r-- | epan/tvbuff_composite.c | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/epan/tvbuff-int.h b/epan/tvbuff-int.h index 550ee5d30d..e828af7647 100644 --- a/epan/tvbuff-int.h +++ b/epan/tvbuff-int.h @@ -41,17 +41,6 @@ struct tvb_ops { tvbuff_t *(*tvb_clone)(tvbuff_t *tvb, guint abs_offset, guint abs_length); }; -typedef struct { - GSList *tvbs; - - /* Used for quick testing to see if this - * is the tvbuff that a COMPOSITE is - * interested in. */ - guint *start_offsets; - guint *end_offsets; - -} tvb_comp_t; - /* * Tvbuff flags. */ @@ -86,12 +75,6 @@ struct tvbuff { gint raw_offset; }; -struct tvb_composite { - struct tvbuff tvb; - - tvb_comp_t composite; -}; - WS_DLL_PUBLIC tvbuff_t *tvb_new(const struct tvb_ops *ops); tvbuff_t *tvb_new_proxy(tvbuff_t *backing); diff --git a/epan/tvbuff_composite.c b/epan/tvbuff_composite.c index 8ec3cc12dc..ade37b1025 100644 --- a/epan/tvbuff_composite.c +++ b/epan/tvbuff_composite.c @@ -29,6 +29,23 @@ #include "tvbuff-int.h" #include "proto.h" /* XXX - only used for DISSECTOR_ASSERT, probably a new header file? */ +typedef struct { + GSList *tvbs; + + /* Used for quick testing to see if this + * is the tvbuff that a COMPOSITE is + * interested in. */ + guint *start_offsets; + guint *end_offsets; + +} tvb_comp_t; + +struct tvb_composite { + struct tvbuff tvb; + + tvb_comp_t composite; +}; + static gsize composite_sizeof(void) { |