Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 20:01:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

If a the contents of a binary XML element only contain ASCII chars then write them in ASCII format instead of hex.

Browse Source
This commit is contained in:
Moritz Bunkus 2005-01-09 13:31:35 +00:00
parent 3bb0591e5c
commit d155287638
1 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/common/xml_element_writer.cpp
View File

@ -38,11 +38,29 @@ print_binary(int level,
const unsigned char *p;
string s;
int i, size;
bool ascii_only;
b = (EbmlBinary *)e;
p = (const unsigned char *)b->GetBuffer();
size = b->GetSize();
ascii_only = true;
for (i = 0; i < size; i++)
if ((p[i] < ' ') || (p[i] > 127)) {
ascii_only = false;
break;
}
if (ascii_only) {
s.append((const char *)p, size);
out->printf("<%s format=\"ascii\">%s</%s>\n", name, escape_xml(s).c_str(),
name);
} else {
string prefix;
prefix = mxsprintf("<%s format=\"hex\">", name);
for (i = 0; i < size; i++) {
if ((i % 16) != 0)
s += " ";
@ -53,10 +71,11 @@ print_binary(int level,
}
if ((level * 2 + 2 * strlen(name) + 2 + 3 + s.length()) <= 78)
out->printf("%s</%s>\n", s.c_str(), name);
out->printf("%s%s</%s>\n", prefix.c_str(), s.c_str(), name);
else
out->printf("\n%*s%s\n%*s</%s>\n", (level + 1) * 2, "", s.c_str(),
level * 2, "", name);
out->printf("%s\n%*s%s\n%*s</%s>\n", prefix.c_str(), (level + 1) * 2, "",
s.c_str(), level * 2, "", name);
}
}
void
@ -82,17 +101,15 @@ write_xml_element_rec(int level,
elt_idx++;
}
for (i = 0; i < level; i++)
out->printf(" ");
out->printf("%*s", level * 2, "");
if (!found) {
out->printf("<!-- Unknown element '%s' -->\n", e->Generic().DebugName);
return;
}
out->printf("<%s%s>", element_map[elt_idx].name,
element_map[elt_idx].type == EBMLT_BINARY ?
" format=\"hex\"" : "");
if (element_map[elt_idx].type != EBMLT_BINARY)
out->printf("<%s>", element_map[elt_idx].name);
switch (element_map[elt_idx].type) {
case EBMLT_MASTER:
out->printf("\n");
@ -113,9 +130,7 @@ write_xml_element_rec(int level,
element_map[elt_idx].end_hook(&cb);
}
for (i = 0; i < level; i++)
out->printf(" ");
out->printf("</%s>\n", element_map[elt_idx].name);
out->printf("%*s</%s>\n", level * 2, "", element_map[elt_idx].name);
break;
case EBMLT_UINT: