osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Have "tvb_ensure_length_remaining()" directly call 

"compute_offset_length()", and throw the exception it returns, rather
than calling "tvb_length_remaining()" and throw BoundsError if it
returns -1; this allows us to add additional exceptions without having
to change "tvb_ensure_length_remaining()".

Make "_tvb_get_nstringz()" static, as it's not used outside "tvbuff.c".

svn path=/trunk/; revision=5397
This commit is contained in:
Guy Harris 2002-05-05 21:07:52 +00:00
parent d612dab6df
commit 33e80cec64
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
epan/tvbuff.c
View File

@ -9,7 +9,7 @@
* the data of a backing tvbuff, or can be a composite of
* other tvbuffs.
*
* $Id: tvbuff.c,v 1.35 2002/05/05 00:57:59 guy Exp $
* $Id: tvbuff.c,v 1.36 2002/05/05 21:07:52 guy Exp $
*
* Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
*
@ -610,18 +610,15 @@ tvb_length_remaining(tvbuff_t *tvb, gint offset)
guint
tvb_ensure_length_remaining(tvbuff_t *tvb, gint offset)
{
gint retval;
guint abs_offset, abs_length;
int exception;
retval = tvb_length_remaining(tvb, offset);
g_assert(tvb->initialized);
if (retval == -1) {
THROW(ReportedBoundsError);
return -1; /* squelch compiler complaint */
}
else {
g_assert(retval >= 0);
return retval;
if (!compute_offset_length(tvb, offset, -1, &abs_offset, &abs_length, &exception)) {
THROW(exception);
}
return abs_length;
}
@ -1599,7 +1596,7 @@ tvb_format_text(tvbuff_t *tvb, gint offset, gint size)
* *bytes_copied will contain the number of bytes actually copied,
* including the terminating-NUL.
*/
gint
static gint
_tvb_get_nstringz(tvbuff_t *tvb, gint offset, guint maxlength, guint8* buffer,
gint *bytes_copied)
{