aboutsummaryrefslogtreecommitdiffstats
path: root/epan/column.c
diff options
context:
space:
mode:
authorGerasimos Dimitriadis <dimeg@intracom.gr>2010-01-25 20:30:09 +0000
committerGerasimos Dimitriadis <dimeg@intracom.gr>2010-01-25 20:30:09 +0000
commite50527b8e1a9c0a8f469121a32fb36c125022b64 (patch)
tree761860e5d4fa7a2592ccab2f1a79a7b89aff4ab7 /epan/column.c
parenteb6bf9e56b3d05df2fd7b7961064a9b9fe3b7784 (diff)
Handle underscore escaping/unescaping for old packet list; Simplify
and make more robust the unescaping function. svn path=/trunk/; revision=31668
Diffstat (limited to 'epan/column.c')
-rw-r--r--epan/column.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/epan/column.c b/epan/column.c
index e1e22cf2dc..c0f5a9a9ca 100644
--- a/epan/column.c
+++ b/epan/column.c
@@ -770,14 +770,11 @@ ws_strdup_unescape_underscore (const gchar *str)
while(*p != 0)
{
- if(*p == '_')
- {
- *q++ = '_';
+ *q++ = *p;
+ if ((*p == '_') && (*(p+1) == '_'))
p += 2;
- continue;
- }
-
- *q++ = *p++;
+ else
+ p++;
}
*q++ = '\0';