osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix tvbtest linking, move private structures to tvbuff_subset 

svn path=/trunk/; revision=50570
This commit is contained in:
Jakub Zawadzki 2013-07-14 07:59:42 +00:00
parent 0d85b75305
commit b3e0623e5c
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/Makefile.am
View File

@ -161,7 +161,7 @@ reassemble_test_LDADD = \
$(GLIB_LIBS) \
-lz
tvbtest: tvbtest.o tvbuff.o except.o to_str.o strutil.o emem.o charsets.o
tvbtest: tvbtest.o tvbuff.o tvbuff_real.o tvbuff_subset.o except.o to_str.o strutil.o emem.o charsets.o
$(LINK) $^ $(GLIB_LIBS) -lz
exntest: exntest.o except.o

17
epan/tvbuff-int.h
View File

@ -41,17 +41,6 @@ struct tvb_ops {
tvbuff_t *(*tvb_clone)(tvbuff_t *tvb, guint abs_offset, guint abs_length);
};
typedef struct {
/** The backing tvbuff_t */
struct tvbuff *tvb;
/** The offset of 'tvb' to which I'm privy */
guint offset;
/** The length of 'tvb' to which I'm privy */
guint length;
} tvb_backing_t;
typedef struct {
GSList *tvbs;
@ -97,12 +86,6 @@ struct tvbuff {
gint raw_offset;
};
struct tvb_subset {
struct tvbuff tvb;
tvb_backing_t subset;
};
struct tvb_composite {
struct tvbuff tvb;

17
epan/tvbuff_subset.c
View File

@ -29,6 +29,23 @@
#include "tvbuff-int.h"
#include "proto.h" /* XXX - only used for DISSECTOR_ASSERT, probably a new header file? */
typedef struct {
/** The backing tvbuff_t */
struct tvbuff *tvb;
/** The offset of 'tvb' to which I'm privy */
guint offset;
/** The length of 'tvb' to which I'm privy */
guint length;
} tvb_backing_t;
struct tvb_subset {
struct tvbuff tvb;
tvb_backing_t subset;
};
static gsize
subset_sizeof(void)
{