diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-10-29 21:56:50 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-10-29 21:56:50 +0000 |
| commit | 62d224011d6315fedb5d66810692e54697f031d9 (patch) | |
| tree | f845fe3e32eeff95a9e4dfbfc6224de31b41267b /plugins | |
| parent | d850e01b43e0bab9b0278c788e4005b61e3bc5a4 (diff) | |
Stop using "tvb_get_ntohll()" and "%llX" in the BOOTP dissector, as the
former depends on having "guint64" and the latter depends on
"%ll[douxX]" being what's used to print 64-bit integers, and there are
platforms on which Etheeal runs that don't have "guint64" or that don't
use "%ll[douxX]" to print 64-bit integers.
Get rid of the routines to extract 64-bit integers into "gint64"s and
"guint64"s, as per Ronnie Sahlberg's suggestion, to discourage people
from writing code that won't work on all platforms; they should be using
FT_UINT64, or the routines in "int-64bit.c", instead.
svn path=/trunk/; revision=4102
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/plugin_api.c | 8 | ||||
| -rw-r--r-- | plugins/plugin_api.h | 8 | ||||
| -rw-r--r-- | plugins/plugin_table.h | 14 |
3 files changed, 3 insertions, 27 deletions
diff --git a/plugins/plugin_api.c b/plugins/plugin_api.c index 493bce92f6..0936a0e13d 100644 --- a/plugins/plugin_api.c +++ b/plugins/plugin_api.c @@ -1,7 +1,7 @@ /* plugin_api.c * Routines for Ethereal plugins. * - * $Id: plugin_api.c,v 1.24 2001/10/17 19:27:42 gram Exp $ + * $Id: plugin_api.c,v 1.25 2001/10/29 21:56:50 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org> @@ -108,15 +108,9 @@ plugin_address_table_init(plugin_address_table_t *pat) p_tvb_get_ntohs = pat->p_tvb_get_ntohs; p_tvb_get_ntoh24 = pat->p_tvb_get_ntoh24; p_tvb_get_ntohl = pat->p_tvb_get_ntohl; -#ifdef G_HAVE_GINT64 - p_tvb_get_ntohll = pat->p_tvb_get_ntohll; -#endif p_tvb_get_letohs = pat->p_tvb_get_letohs; p_tvb_get_letoh24 = pat->p_tvb_get_letoh24; p_tvb_get_letohl = pat->p_tvb_get_letohl; -#ifdef G_HAVE_GINT64 - p_tvb_get_letohll = pat->p_tvb_get_letohll; -#endif p_tvb_memcpy = pat->p_tvb_memcpy; p_tvb_memdup = pat->p_tvb_memdup; p_tvb_get_ptr = pat->p_tvb_get_ptr; diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h index ce775c554e..8b384642c7 100644 --- a/plugins/plugin_api.h +++ b/plugins/plugin_api.h @@ -1,7 +1,7 @@ /* plugin_api.h * Routines for Ethereal plugins. * - * $Id: plugin_api.h,v 1.24 2001/10/17 19:27:42 gram Exp $ + * $Id: plugin_api.h,v 1.25 2001/10/29 21:56:50 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org> @@ -114,16 +114,10 @@ #define tvb_get_ntohs (*p_tvb_get_ntohs) #define tvb_get_ntoh24 (*p_tvb_get_ntoh24) #define tvb_get_ntohl (*p_tvb_get_ntohl) -#ifdef G_HAVE_GINT64 -#define tvb_get_ntohll (*p_tvb_get_ntohll) -#endif #define tvb_get_letohs (*p_tvb_get_letohs) #define tvb_get_letoh24 (*p_tvb_get_letoh24) #define tvb_get_letohl (*p_tvb_get_letohl) -#ifdef G_HAVE_GINT64 -#define tvb_get_letohll (*p_tvb_get_letohll) -#endif #define tvb_memcpy (*p_tvb_memcpy) #define tvb_memdup (*p_tvb_memdup) diff --git a/plugins/plugin_table.h b/plugins/plugin_table.h index a9734386b9..053012a6d3 100644 --- a/plugins/plugin_table.h +++ b/plugins/plugin_table.h @@ -1,7 +1,7 @@ /* plugin_table.h * Table of exported addresses for Ethereal plugins. * - * $Id: plugin_table.h,v 1.26 2001/10/17 19:27:42 gram Exp $ + * $Id: plugin_table.h,v 1.27 2001/10/29 21:56:50 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org> @@ -123,16 +123,10 @@ typedef guint8 (*addr_tvb_get_guint8)(tvbuff_t*, gint); typedef guint16 (*addr_tvb_get_ntohs)(tvbuff_t*, gint); typedef guint32 (*addr_tvb_get_ntoh24)(tvbuff_t*, gint); typedef guint32 (*addr_tvb_get_ntohl)(tvbuff_t*, gint); -#ifdef G_HAVE_GINT64 -typedef guint64 (*addr_tvb_get_ntohll)(tvbuff_t*, gint); -#endif typedef guint16 (*addr_tvb_get_letohs)(tvbuff_t*, gint); typedef guint32 (*addr_tvb_get_letoh24)(tvbuff_t*, gint); typedef guint32 (*addr_tvb_get_letohl)(tvbuff_t*, gint); -#ifdef G_HAVE_GINT64 -typedef guint64 (*addr_tvb_get_letohll)(tvbuff_t*, gint); -#endif typedef guint8* (*addr_tvb_memcpy)(tvbuff_t*, guint8* target, gint, gint); typedef guint8* (*addr_tvb_memdup)(tvbuff_t*, gint, gint); @@ -286,16 +280,10 @@ typedef struct { addr_tvb_get_ntohs p_tvb_get_ntohs; addr_tvb_get_ntoh24 p_tvb_get_ntoh24; addr_tvb_get_ntohl p_tvb_get_ntohl; -#ifdef G_HAVE_GINT64 - addr_tvb_get_ntohll p_tvb_get_ntohll; -#endif addr_tvb_get_letohs p_tvb_get_letohs; addr_tvb_get_letoh24 p_tvb_get_letoh24; addr_tvb_get_letohl p_tvb_get_letohl; -#ifdef G_HAVE_GINT64 - addr_tvb_get_letohll p_tvb_get_letohll; -#endif addr_tvb_memcpy p_tvb_memcpy; addr_tvb_memdup p_tvb_memdup; |