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 /epan/tvbuff.c | |
| parent | d850e01b43e0bab9b0278c788e4005b61e3bc5a4 (diff) | |
| download | wireshark-62d224011d6315fedb5d66810692e54697f031d9.tar.gz | |
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 'epan/tvbuff.c')
| -rw-r--r-- | epan/tvbuff.c | 25 |
1 files changed, 1 insertions, 24 deletions
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. |