From 39b39ae54473b36733a7c600c1a13b0b29ebae70 Mon Sep 17 00:00:00 2001 From: pjd Date: Tue, 20 Apr 2004 17:07:55 +0000 Subject: - Don't check if 'gp' is non-NULL, it always is and GEOM wants to dump geom configuration when 'pp' and 'cp' are NULL. - Use tabs instead of spaces. --- sys/geom/concat/g_concat.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'sys/geom') diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c index 5a59863..2c6d9e2 100644 --- a/sys/geom/concat/g_concat.c +++ b/sys/geom/concat/g_concat.c @@ -750,28 +750,28 @@ static void g_concat_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, struct g_consumer *cp, struct g_provider *pp) { - struct g_concat_softc *sc; + struct g_concat_softc *sc; - sc = gp->softc; - if (sc == NULL) - return; - if (gp != NULL) { - sbuf_printf(sb, "%s%zu\n", indent, sc->sc_id); + sc = gp->softc; + if (sc == NULL) + return; + if (pp == NULL && cp == NULL) { + sbuf_printf(sb, "%s%zu\n", indent, sc->sc_id); switch (sc->sc_type) { case G_CONCAT_TYPE_AUTOMATIC: - sbuf_printf(sb, "%s%s\n", indent, + sbuf_printf(sb, "%s%s\n", indent, "automatic"); break; case G_CONCAT_TYPE_MANUAL: - sbuf_printf(sb, "%s%s\n", indent, + sbuf_printf(sb, "%s%s\n", indent, "manual"); break; default: - sbuf_printf(sb, "%s%s\n", indent, + sbuf_printf(sb, "%s%s\n", indent, "unknown"); break; } - } + } } DECLARE_GEOM_CLASS(g_concat_class, g_concat); -- cgit v1.1