Date: Fri, 8 Jun 2012 05:54:36 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r236735 - stable/8/sys/geom/multipath Message-ID: <201206080554.q585sabU035755@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Fri Jun 8 05:54:36 2012 New Revision: 236735 URL: http://svn.freebsd.org/changeset/base/236735 Log: MFC r236619: Add missing newlines into XML output. Modified: stable/8/sys/geom/multipath/g_multipath.c Directory Properties: stable/8/sys/ (props changed) Modified: stable/8/sys/geom/multipath/g_multipath.c ============================================================================== --- stable/8/sys/geom/multipath/g_multipath.c Fri Jun 8 05:53:25 2012 (r236734) +++ stable/8/sys/geom/multipath/g_multipath.c Fri Jun 8 05:54:36 2012 (r236735) @@ -1312,7 +1312,7 @@ g_multipath_dumpconf(struct sbuf *sb, co if (sc == NULL) return; if (cp != NULL) { - sbuf_printf(sb, "%s<State>%s</State>", indent, + sbuf_printf(sb, "%s<State>%s</State>\n", indent, (cp->index & MP_NEW) ? "NEW" : (cp->index & MP_LOST) ? "LOST" : (cp->index & MP_FAIL) ? "FAIL" : @@ -1321,17 +1321,17 @@ g_multipath_dumpconf(struct sbuf *sb, co sc->sc_active_active == 2 ? "READ" : "PASSIVE"); } else { good = g_multipath_good(gp); - sbuf_printf(sb, "%s<State>%s</State>", indent, + sbuf_printf(sb, "%s<State>%s</State>\n", indent, good == 0 ? "BROKEN" : (good != sc->sc_ndisks || sc->sc_ndisks == 1) ? "DEGRADED" : "OPTIMAL"); } if (cp == NULL && pp == NULL) { - sbuf_printf(sb, "%s<UUID>%s</UUID>", indent, sc->sc_uuid); - sbuf_printf(sb, "%s<Mode>Active/%s</Mode>", indent, + sbuf_printf(sb, "%s<UUID>%s</UUID>\n", indent, sc->sc_uuid); + sbuf_printf(sb, "%s<Mode>Active/%s</Mode>\n", indent, sc->sc_active_active == 2 ? "Read" : sc->sc_active_active == 1 ? "Active" : "Passive"); - sbuf_printf(sb, "%s<Type>%s</Type>", indent, + sbuf_printf(sb, "%s<Type>%s</Type>\n", indent, sc->sc_uuid[0] == 0 ? "MANUAL" : "AUTOMATIC"); } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206080554.q585sabU035755>