diff options
| author | mav <mav@FreeBSD.org> | 2014-12-23 12:44:16 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2014-12-23 12:44:16 +0000 |
| commit | be311950729ed36fd8722a9c139ac2270a780f1d (patch) | |
| tree | a1f5e72fd9c5759da87b24b592535ad1c671b9a3 /usr.sbin/ctladm/ctladm.c | |
| parent | 69ac3404933eab19cfde6a4c1e88ca7b9bd3bb18 (diff) | |
| download | FreeBSD-src-be311950729ed36fd8722a9c139ac2270a780f1d.zip FreeBSD-src-be311950729ed36fd8722a9c139ac2270a780f1d.tar.gz | |
MFC r275958: Report XML parsing errors.
Diffstat (limited to 'usr.sbin/ctladm/ctladm.c')
| -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"); |
