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

epan: Rewrite format_text_chr() using standard APIs

This commit is contained in:
João Valverde 2021-12-01 23:00:57 +00:00
parent 5059c15a2c
commit 76186f16fb
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
epan/strutil.c
View File

@ -571,33 +571,24 @@ format_text_wsp(wmem_allocator_t* allocator, const guchar *string, size_t len)
* This is useful for displaying binary data that frequently but not always
* contains text; otherwise the number of C escape codes makes it unreadable.
*/
gchar *
format_text_chr(wmem_allocator_t* allocator, const guchar *string, const size_t len, const guchar chr)
char *
format_text_chr(wmem_allocator_t *allocator, const char *string, size_t len, char chr)
{
FMTBUF_VARS;
const guchar *stringend = string + len;
guchar c;
wmem_strbuf_t *buf;
while (string < stringend)
{
FMTBUF_EXPAND(1);
c = *string++;
if (g_ascii_isprint(c))
{
FMTBUF_PUTCHAR(c);
buf = wmem_strbuf_sized_new(allocator, len + 1, 0);
for (const char *p = string; p < string + len; p++) {
if (g_ascii_isprint(*p)) {
wmem_strbuf_append_c(buf, *p);
}
else if (g_ascii_isspace(c))
{
FMTBUF_PUTCHAR(' ');
else if (g_ascii_isspace(*p)) {
wmem_strbuf_append_c(buf, ' ');
}
else
{
FMTBUF_PUTCHAR(chr);
else {
wmem_strbuf_append_c(buf, chr);
}
}
FMTBUF_ENDSTR;
return fmtbuf;
return wmem_strbuf_finalize(buf);
}
static gboolean

3
epan/strutil.h
View File

@ -132,7 +132,8 @@ gchar* format_text_wsp(wmem_allocator_t* allocator, const guchar *line, size
*
*/
WS_DLL_PUBLIC
gchar* format_text_chr(wmem_allocator_t* allocator, const guchar *string, const size_t len, const guchar chr);
char *format_text_chr(wmem_allocator_t *allocator,
const char *string, size_t len, char chr);
/** Turn a string of hex digits with optional separators (defined by