diff options
| author | mav <mav@FreeBSD.org> | 2014-12-20 16:13:31 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2014-12-20 16:13:31 +0000 |
| commit | b0b1f5cb6c9b349eeaaa5e31d7aa9f6d965bb20d (patch) | |
| tree | 7b7630a4aa9eaf63f4677907ce04f56e220e1736 /usr.sbin | |
| parent | b008919e36c71bc0b8f58207da255c34bac85076 (diff) | |
| download | FreeBSD-src-b0b1f5cb6c9b349eeaaa5e31d7aa9f6d965bb20d.zip FreeBSD-src-b0b1f5cb6c9b349eeaaa5e31d7aa9f6d965bb20d.tar.gz | |
Report XML parsing errors.
MFC after: 3 days
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/ctladm/ctladm.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index 03f46c9..646cfbf 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -3643,11 +3643,14 @@ retry: XML_SetCharacterDataHandler(parser, cctl_islist_char_handler); retval = XML_Parse(parser, conn_str, strlen(conn_str), 1); - XML_ParserFree(parser); if (retval != 1) { + warnx("%s: Unable to parse XML: Error %d", __func__, + XML_GetErrorCode(parser)); + XML_ParserFree(parser); retval = 1; goto bailout; } + XML_ParserFree(parser); if (verbose != 0) { STAILQ_FOREACH(conn, &islist.conn_list, links) { @@ -4058,11 +4061,14 @@ retry: XML_SetCharacterDataHandler(parser, cctl_char_handler); retval = XML_Parse(parser, lun_str, strlen(lun_str), 1); - XML_ParserFree(parser); if (retval != 1) { + warnx("%s: Unable to parse XML: Error %d", __func__, + XML_GetErrorCode(parser)); + XML_ParserFree(parser); retval = 1; goto bailout; } + XML_ParserFree(parser); printf("LUN Backend %18s %4s %-16s %-16s\n", "Size (Blocks)", "BS", "Serial Number", "Device ID"); @@ -4336,11 +4342,14 @@ retry: XML_SetCharacterDataHandler(parser, cctl_char_phandler); retval = XML_Parse(parser, port_str, strlen(port_str), 1); - XML_ParserFree(parser); if (retval != 1) { + warnx("%s: Unable to parse XML: Error %d", __func__, + XML_GetErrorCode(parser)); + XML_ParserFree(parser); retval = 1; goto bailout; } + XML_ParserFree(parser); if (quiet == 0) printf("Port Online Frontend Name pp vp\n"); |
