Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge pull request #1509 from skybon/patch-1 

Work around invalid XML in logs
This commit is contained in:
Rom Walton 2016-04-05 11:09:14 -04:00
parent a2a1ee720d 7a6b5ee204
commit 377c8448b2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/acct_mgr.cpp
View File

@ -409,7 +409,7 @@ int ACCT_MGR_OP::parse(FILE* f) {
} }
if (log_flags.unparsed_xml) { if (log_flags.unparsed_xml) {
msg_printf(NULL, MSG_INFO, msg_printf(NULL, MSG_INFO,
"[unparsed_xml] ACCT_MGR_OP::parse: unrecognized tag <%s>", "[unparsed_xml] ACCT_MGR_OP::parse: unrecognized tag <%s/>",
xp.parsed_tag xp.parsed_tag
); );
} }

4
client/log_flags.cpp
View File

@ -457,7 +457,7 @@ int CC_CONFIG::parse_options_client(XML_PARSER& xp) {
msg_printf_notice(NULL, false, msg_printf_notice(NULL, false,
"http://boinc.berkeley.edu/manager_links.php?target=notice&controlid=config", "http://boinc.berkeley.edu/manager_links.php?target=notice&controlid=config",
"%s: <%s>", "%s: <%s/>",
_("Unrecognized tag in cc_config.xml"), _("Unrecognized tag in cc_config.xml"),
xp.parsed_tag xp.parsed_tag
); );
@ -512,7 +512,7 @@ int CC_CONFIG::parse_client(FILE* f) {
if (xp.match_tag("log_flags/")) continue; if (xp.match_tag("log_flags/")) continue;
msg_printf_notice(NULL, false, msg_printf_notice(NULL, false,
"http://boinc.berkeley.edu/manager_links.php?target=notice&controlid=config", "http://boinc.berkeley.edu/manager_links.php?target=notice&controlid=config",
"%s: <%s>", "%s: <%s/>",
_("Unrecognized tag in cc_config.xml"), _("Unrecognized tag in cc_config.xml"),
xp.parsed_tag xp.parsed_tag
); );

2
lib/parse.cpp
View File

@ -878,7 +878,7 @@ void XML_PARSER::skip_unexpected(
if (verbose) { if (verbose) {
fprintf(stderr, fprintf(stderr,
"%s: Unrecognized XML tag '<%s>' in %s; skipping\n", "%s: Unrecognized XML tag '<%s/>' in %s; skipping\n",
time_to_string(dtime()), start_tag, where time_to_string(dtime()), start_tag, where
); );
} }