diff options
author | phk <phk@FreeBSD.org> | 2002-04-24 21:02:28 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2002-04-24 21:02:28 +0000 |
commit | 3a1c16f2bcb32dc4c3b766e6ebb3ae7178c54eda (patch) | |
tree | 220f0735e59bb6760ae1c105ce87b2929690643f /sys/geom/geom_dump.c | |
parent | 58cdadc9ad1b2a83fac1cada6aebb9a313c560a9 (diff) | |
download | FreeBSD-src-3a1c16f2bcb32dc4c3b766e6ebb3ae7178c54eda.zip FreeBSD-src-3a1c16f2bcb32dc4c3b766e6ebb3ae7178c54eda.tar.gz |
Improve the cross-references in the XML output.
Explained by: des
Sponsored by: DARPA & NAI Labs.
Diffstat (limited to 'sys/geom/geom_dump.c')
-rw-r--r-- | sys/geom/geom_dump.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/sys/geom/geom_dump.c b/sys/geom/geom_dump.c index 5952e24..619e0ed 100644 --- a/sys/geom/geom_dump.c +++ b/sys/geom/geom_dump.c @@ -120,10 +120,10 @@ static void g_conf_consumer(struct sbuf *sb, struct g_consumer *cp) { - sbuf_printf(sb, "\t<consumer>\n"); - sbuf_printf(sb, "\t <ref>%p</ref>\n", cp); - sbuf_printf(sb, "\t <geom><ref>%p</ref></geom>\n", cp->geom); - sbuf_printf(sb, "\t <provider><ref>%p</ref></provider>\n", cp->provider); + sbuf_printf(sb, "\t<consumer id=\"%p\">\n", cp); + sbuf_printf(sb, "\t <geom ref=\"%p\"/>\n", cp->geom); + if (cp->provider != NULL) + sbuf_printf(sb, "\t <provider ref=\"%p\"/>\n", cp->provider); sbuf_printf(sb, "\t <mode>r%dw%de%d</mode>\n", cp->acr, cp->acw, cp->ace); if (cp->geom->dumpconf) { @@ -138,9 +138,8 @@ static void g_conf_provider(struct sbuf *sb, struct g_provider *pp) { - sbuf_printf(sb, "\t<provider>\n"); - sbuf_printf(sb, "\t <ref>%p</ref>\n", pp); - sbuf_printf(sb, "\t <geom><ref>%p</ref></geom>\n", pp->geom); + sbuf_printf(sb, "\t<provider id=\"%p\">\n", pp); + sbuf_printf(sb, "\t <geom ref=\"%p\"/>\n", pp->geom); sbuf_printf(sb, "\t <mode>r%dw%de%d</mode>\n", pp->acr, pp->acw, pp->ace); sbuf_printf(sb, "\t <name>%s</name>\n", pp->name); @@ -159,9 +158,8 @@ g_conf_geom(struct sbuf *sb, struct g_geom *gp, struct g_provider *pp, struct g_ struct g_consumer *cp2; struct g_provider *pp2; - sbuf_printf(sb, " <geom>\n"); - sbuf_printf(sb, " <ref>%p</ref>\n", gp); - sbuf_printf(sb, " <class><ref>%p</ref></class>\n", gp->class); + sbuf_printf(sb, " <geom id=\"%p\">\n", gp); + sbuf_printf(sb, " <class ref=\"%p\"/>\n", gp->class); sbuf_printf(sb, " <name>%s</name>\n", gp->name); sbuf_printf(sb, " <rank>%d</rank>\n", gp->rank); if (gp->dumpconf) { @@ -188,8 +186,7 @@ g_conf_class(struct sbuf *sb, struct g_class *mp, struct g_geom *gp, struct g_pr { struct g_geom *gp2; - sbuf_printf(sb, " <class>\n"); - sbuf_printf(sb, " <ref>%p</ref>\n", mp); + sbuf_printf(sb, " <class id=\"%p\">\n", mp); sbuf_printf(sb, " <name>%s</name>\n", mp->name); LIST_FOREACH(gp2, &mp->geom, geom) { if (gp != NULL && gp != gp2) |