diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-10-29 21:56:50 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-10-29 21:56:50 +0000 |
commit | 46bcac711ed354a1b7f3c70584460fb5dd44be81 (patch) | |
tree | f845fe3e32eeff95a9e4dfbfc6224de31b41267b /epan/tvbuff.h | |
parent | 44d230ca20e26d1dc56e85773402b486ec33cd9e (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4102 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/tvbuff.h')
-rw-r--r-- | epan/tvbuff.h | 8 |
1 files changed, 1 insertions, 7 deletions
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 |