diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/pint.h | 26 | ||||
| -rw-r--r-- | epan/plugins.c | 8 | ||||
| -rw-r--r-- | epan/tvbuff.c | 25 | ||||
| -rw-r--r-- | epan/tvbuff.h | 8 |
4 files changed, 4 insertions, 63 deletions
diff --git a/epan/pint.h b/epan/pint.h index 380880bbc6..2eaef53153 100644 --- a/epan/pint.h +++ b/epan/pint.h @@ -2,7 +2,7 @@ * Definitions for extracting and translating integers safely and portably * via pointers. * - * $Id: pint.h,v 1.3 2000/11/11 10:23:43 guy Exp $ + * $Id: pint.h,v 1.4 2001/10/29 21:56:48 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -32,10 +32,6 @@ /* Pointer versions of ntohs and ntohl. Given a pointer to a member of a * byte array, returns the value of the two or four bytes at the pointer. * The pletoh[sl] versions return the little-endian representation. - * - * If G_HAVE_GINT64 is defined, so we can use "gint64" and "guint64" to - * refer to 64-bit integral quantities, we also provide pntohll and - * phtolell, which extract 64-bit integral quantities. */ #define pntohs(p) ((guint16) \ @@ -51,16 +47,6 @@ (guint32)*((guint8 *)(p)+2)<<8| \ (guint32)*((guint8 *)(p)+3)<<0) -#ifdef G_HAVE_GINT64 -#define pntohll(p) ((guint64)*((guint8 *)(p)+0)<<56| \ - (guint64)*((guint8 *)(p)+1)<<48| \ - (guint64)*((guint8 *)(p)+2)<<40| \ - (guint64)*((guint8 *)(p)+3)<<32| \ - (guint64)*((guint8 *)(p)+4)<<24| \ - (guint64)*((guint8 *)(p)+5)<<16| \ - (guint64)*((guint8 *)(p)+6)<<8| \ - (guint64)*((guint8 *)(p)+7)<<0) -#endif #define pletohs(p) ((guint16) \ ((guint16)*((guint8 *)(p)+1)<<8| \ @@ -75,16 +61,6 @@ (guint32)*((guint8 *)(p)+1)<<8| \ (guint32)*((guint8 *)(p)+0)<<0) -#ifdef G_HAVE_GINT64 -#define pletohll(p) ((guint64)*((guint8 *)(p)+7)<<56| \ - (guint64)*((guint8 *)(p)+6)<<48| \ - (guint64)*((guint8 *)(p)+5)<<40| \ - (guint64)*((guint8 *)(p)+4)<<32| \ - (guint64)*((guint8 *)(p)+3)<<24| \ - (guint64)*((guint8 *)(p)+2)<<16| \ - (guint64)*((guint8 *)(p)+1)<<8| \ - (guint64)*((guint8 *)(p)+0)<<0) -#endif /* Macros to byte-swap 32-bit and 16-bit quantities. */ diff --git a/epan/plugins.c b/epan/plugins.c index 69ca623e5a..1a18ae90ac 100644 --- a/epan/plugins.c +++ b/epan/plugins.c @@ -1,7 +1,7 @@ /* plugins.c * plugin routines * - * $Id: plugins.c,v 1.37 2001/10/24 07:18:37 guy Exp $ + * $Id: plugins.c,v 1.38 2001/10/29 21:56:48 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -367,16 +367,10 @@ init_plugins(const char *plugin_dir) patable.p_tvb_get_ntohs = tvb_get_ntohs; patable.p_tvb_get_ntoh24 = tvb_get_ntoh24; patable.p_tvb_get_ntohl = tvb_get_ntohl; -#ifdef G_HAVE_GINT64 - patable.p_tvb_get_ntohll = tvb_get_ntohll; -#endif patable.p_tvb_get_letohs = tvb_get_letohs; patable.p_tvb_get_letoh24 = tvb_get_letoh24; patable.p_tvb_get_letohl = tvb_get_letohl; -#ifdef G_HAVE_GINT64 - patable.p_tvb_get_letohll = tvb_get_letohll; -#endif patable.p_tvb_memcpy = tvb_memcpy; patable.p_tvb_memdup = tvb_memdup; diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 095c2c5862..c3f7f23d45 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -9,7 +9,7 @@ * the data of a backing tvbuff, or can be a composite of * other tvbuffs. * - * $Id: tvbuff.c,v 1.19 2001/10/26 17:29:09 gram Exp $ + * $Id: tvbuff.c,v 1.20 2001/10/29 21:56:48 guy Exp $ * * Copyright (c) 2000 by Gilbert Ramirez <gram@xiexie.org> * @@ -982,17 +982,6 @@ tvb_get_ntohl(tvbuff_t *tvb, gint offset) return pntohl(ptr); } -#ifdef G_HAVE_GINT64 -guint64 -tvb_get_ntohll(tvbuff_t *tvb, gint offset) -{ - guint8* ptr; - - ptr = ensure_contiguous(tvb, offset, sizeof(guint64)); - return pntohll(ptr); -} -#endif - guint16 tvb_get_letohs(tvbuff_t *tvb, gint offset) { @@ -1020,18 +1009,6 @@ tvb_get_letohl(tvbuff_t *tvb, gint offset) return pletohl(ptr); } -#ifdef G_HAVE_GINT64 -guint64 -tvb_get_letohll(tvbuff_t *tvb, gint offset) -{ - guint8* ptr; - - ptr = ensure_contiguous(tvb, offset, sizeof(guint64)); - return pletohll(ptr); -} -#endif - - /* Find first occurence of needle in tvbuff, starting at offset. Searches * at most maxlength number of bytes; if maxlength is -1, searches to * end of tvbuff. diff --git a/epan/tvbuff.h b/epan/tvbuff.h index 00e713e572..32681d4568 100644 --- a/epan/tvbuff.h +++ b/epan/tvbuff.h @@ -9,7 +9,7 @@ * the data of a backing tvbuff, or can be a composite of * other tvbuffs. * - * $Id: tvbuff.h,v 1.15 2001/10/26 17:29:09 gram Exp $ + * $Id: tvbuff.h,v 1.16 2001/10/29 21:56:48 guy Exp $ * * Copyright (c) 2000 by Gilbert Ramirez <gram@xiexie.org> * @@ -227,16 +227,10 @@ guint8 tvb_get_guint8(tvbuff_t*, gint offset); guint16 tvb_get_ntohs(tvbuff_t*, gint offset); guint32 tvb_get_ntoh24(tvbuff_t*, gint offset); guint32 tvb_get_ntohl(tvbuff_t*, gint offset); -#ifdef G_HAVE_GINT64 -guint64 tvb_get_ntohll(tvbuff_t*, gint offset); -#endif guint16 tvb_get_letohs(tvbuff_t*, gint offset); guint32 tvb_get_letoh24(tvbuff_t*, gint offset); guint32 tvb_get_letohl(tvbuff_t*, gint offset); -#ifdef G_HAVE_GINT64 -guint64 tvb_get_letohll(tvbuff_t*, gint offset); -#endif /* Returns target for convenience. Does not suffer from possible * expense of tvb_get_ptr(), since this routine is smart enough |