diff options
author | rpaulo <rpaulo@FreeBSD.org> | 2010-10-13 11:35:59 +0000 |
---|---|---|
committer | rpaulo <rpaulo@FreeBSD.org> | 2010-10-13 11:35:59 +0000 |
commit | 7bca860ea7baaf6503c57577ef049c3c139f042f (patch) | |
tree | 18d21f5a71e747ae3bead63385a81f3c8f1ed45d /sys/geom | |
parent | 01eca72a5f7a5f22c189d5a868e8701dacc246f0 (diff) | |
download | FreeBSD-src-7bca860ea7baaf6503c57577ef049c3c139f042f.zip FreeBSD-src-7bca860ea7baaf6503c57577ef049c3c139f042f.tar.gz |
The canonical way to print __func__ when using KASSERT() is to write
("%s", __func__). This avoids clang's -Wformat-string warnings.
Diffstat (limited to 'sys/geom')
-rw-r--r-- | sys/geom/part/g_part.c | 13 | ||||
-rw-r--r-- | sys/geom/part/g_part_ebr.c | 4 | ||||
-rw-r--r-- | sys/geom/part/g_part_mbr.c | 4 |
3 files changed, 11 insertions, 10 deletions
diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index eb7dcda..d88213b 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -1597,7 +1597,8 @@ g_part_ctlreq(struct gctl_req *req, struct g_class *mp, const char *verb) (gpp.gpp_parms & G_PART_PARM_FLAGS) && strchr(gpp.gpp_flags, 'C') != NULL) ? 1 : 0; if (auto_commit) { - KASSERT(gpp.gpp_parms & G_PART_PARM_GEOM, (__func__)); + KASSERT(gpp.gpp_parms & G_PART_PARM_GEOM, ("%s", + __func__)); error = g_part_ctl_commit(req, &gpp); } } @@ -1737,11 +1738,11 @@ g_part_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, struct g_part_entry *entry; struct g_part_table *table; - KASSERT(sb != NULL && gp != NULL, (__func__)); + KASSERT(sb != NULL && gp != NULL, ("%s", __func__)); table = gp->softc; if (indent == NULL) { - KASSERT(cp == NULL && pp != NULL, (__func__)); + KASSERT(cp == NULL && pp != NULL, ("%s", __func__)); entry = pp->private; if (entry == NULL) return; @@ -1756,7 +1757,7 @@ g_part_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, */ G_PART_DUMPCONF(table, entry, sb, indent); } else if (cp != NULL) { /* Consumer configuration. */ - KASSERT(pp == NULL, (__func__)); + KASSERT(pp == NULL, ("%s", __func__)); /* none */ } else if (pp != NULL) { /* Provider configuration. */ entry = pp->private; @@ -1799,11 +1800,11 @@ g_part_orphan(struct g_consumer *cp) struct g_part_table *table; pp = cp->provider; - KASSERT(pp != NULL, (__func__)); + KASSERT(pp != NULL, ("%s", __func__)); G_PART_TRACE((G_T_TOPOLOGY, "%s(%s)", __func__, pp->name)); g_topology_assert(); - KASSERT(pp->error != 0, (__func__)); + KASSERT(pp->error != 0, ("%s", __func__)); table = cp->geom->softc; if (table != NULL && table->gpt_opened) g_access(cp, -1, -1, -1); diff --git a/sys/geom/part/g_part_ebr.c b/sys/geom/part/g_part_ebr.c index b107e61..f16f42a 100644 --- a/sys/geom/part/g_part_ebr.c +++ b/sys/geom/part/g_part_ebr.c @@ -221,8 +221,8 @@ g_part_ebr_add(struct g_part_table *basetable, struct g_part_entry *baseentry, if (baseentry->gpe_deleted) bzero(&entry->ent, sizeof(entry->ent)); - KASSERT(baseentry->gpe_start <= start, (__func__)); - KASSERT(baseentry->gpe_end >= start + size - 1, (__func__)); + KASSERT(baseentry->gpe_start <= start, ("%s", __func__)); + KASSERT(baseentry->gpe_end >= start + size - 1, ("%s", __func__)); baseentry->gpe_index = (start / sectors) + 1; baseentry->gpe_offset = (off_t)(start + sectors) * pp->sectorsize; baseentry->gpe_start = start; diff --git a/sys/geom/part/g_part_mbr.c b/sys/geom/part/g_part_mbr.c index c006c59..454c759 100644 --- a/sys/geom/part/g_part_mbr.c +++ b/sys/geom/part/g_part_mbr.c @@ -204,8 +204,8 @@ g_part_mbr_add(struct g_part_table *basetable, struct g_part_entry *baseentry, if (baseentry->gpe_deleted) bzero(&entry->ent, sizeof(entry->ent)); - KASSERT(baseentry->gpe_start <= start, (__func__)); - KASSERT(baseentry->gpe_end >= start + size - 1, (__func__)); + KASSERT(baseentry->gpe_start <= start, ("%s", __func__)); + KASSERT(baseentry->gpe_end >= start + size - 1, ("%s", __func__)); baseentry->gpe_start = start; baseentry->gpe_end = start + size - 1; entry->ent.dp_start = start; |