osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Added tvb_format_stringzpad_wsp(). 

svn path=/trunk/; revision=28140
This commit is contained in:
Stig Bjørlykke 2009-04-24 08:08:37 +00:00
parent a3534cd46a
commit d628c0a4cc
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
epan/tvbuff.c
View File

@ -2111,6 +2111,30 @@ tvb_format_stringzpad(tvbuff_t *tvb, gint offset, gint size)
}
/*
* Like "tvb_format_text_wsp()", but for null-padded strings; don't show
* the null padding characters as "\000".
*/
gchar *
tvb_format_stringzpad_wsp(tvbuff_t *tvb, gint offset, gint size)
{
const guint8 *ptr, *p;
gint len = size;
gint stringlen;
if ((ptr = ensure_contiguous(tvb, offset, size)) == NULL) {
len = tvb_length_remaining(tvb, offset);
ptr = ensure_contiguous(tvb, offset, len);
}
for (p = ptr, stringlen = 0; stringlen < len && *p != '\0'; p++, stringlen++)
;
return format_text_wsp(ptr, stringlen);
}
/*
* Given a tvbuff, an offset, and a length, allocate a buffer big enough
* to hold a non-null-terminated string of that length at that offset,

6
epan/tvbuff.h
View File

@ -447,6 +447,12 @@ extern gchar * tvb_format_text_wsp(tvbuff_t *tvb, gint offset, gint size);
*/
extern gchar *tvb_format_stringzpad(tvbuff_t *tvb, gint offset, gint size);
/**
* Like "tvb_format_text_wsp()", but for null-padded strings; don't show
* the null padding characters as "\000".
*/
extern gchar *tvb_format_stringzpad_wsp(tvbuff_t *tvb, gint offset, gint size);
/**
* Given a tvbuff, an offset, and a length, allocate a buffer big enough