diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-03-10 12:57:22 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-03-10 12:57:22 +0000 |
| commit | bb39c4f7a63497c5c7d39e9462b9472859a03310 (patch) | |
| tree | c7c74cba29cc0c3e72746baef07520fc866967d3 | |
| parent | 923855bb20845f55472dfe8e62b7b43660f2f63b (diff) | |
add guid-utils.h to Makefile.common
remove unused variables from tvbuff.c
svn path=/trunk/; revision=17567
| -rw-r--r-- | epan/Makefile.common | 1 | ||||
| -rw-r--r-- | epan/tvbuff.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/epan/Makefile.common b/epan/Makefile.common index 2d9c2d1f89..8fc886f440 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -141,6 +141,7 @@ LIBETHEREAL_INCLUDES = \ ipproto.h \ ipv4.h \ ipv6-utils.h \ + guid-utils.h \ lapd_sapi.h \ llcsaps.h \ nlpid.h \ diff --git a/epan/tvbuff.c b/epan/tvbuff.c index fd7d0404ed..39cb3e763e 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -1415,8 +1415,6 @@ tvb_get_ipv6(tvbuff_t *tvb, gint offset, struct e_in6_addr *addr) void tvb_get_ntohguid(tvbuff_t *tvb, gint offset, e_guid_t *guid) { - const guint8* ptr; - ensure_contiguous(tvb, offset, sizeof(*guid)); guid->data1 = tvb_get_ntohl(tvb, offset); guid->data2 = tvb_get_ntohs(tvb, offset + 4); @@ -1427,8 +1425,6 @@ tvb_get_ntohguid(tvbuff_t *tvb, gint offset, e_guid_t *guid) void tvb_get_letohguid(tvbuff_t *tvb, gint offset, e_guid_t *guid) { - const guint8* ptr; - ensure_contiguous(tvb, offset, sizeof(*guid)); guid->data1 = tvb_get_letohl(tvb, offset); guid->data2 = tvb_get_letohs(tvb, offset + 4); |