Author: rpaulo
Date: Wed Oct 13 11:35:59 2010
New Revision: 213769
URL: http://svn.freebsd.org/changeset/base/213769
Log:
The canonical way to print __func__ when using KASSERT() is to write
("%s", __func__). This avoids clang's -Wformat-string warnings.
Modified:
head/sys/geom/part/g_part.c
head/sys/geom/part/g_part_ebr.c
head/sys/geom/part/g_part_mbr.c
Modified: head/sys/geom/part/g_part.c
==============================================================================
--- head/sys/geom/part/g_part.c Wed Oct 13 11:23:27 2010 (r213768)
+++ head/sys/geom/part/g_part.c Wed Oct 13 11:35:59 2010 (r213769)
@@ -1597,7 +1597,8 @@ g_part_ctlreq(struct gctl_req *req, stru
(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 c
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 c
*/
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);
Modified: head/sys/geom/part/g_part_ebr.c
==============================================================================
--- head/sys/geom/part/g_part_ebr.c Wed Oct 13 11:23:27 2010
(r213768)
+++ head/sys/geom/part/g_part_ebr.c Wed Oct 13 11:35:59 2010
(r213769)
@@ -221,8 +221,8 @@ g_part_ebr_add(struct g_part_table *base
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;
Modified: head/sys/geom/part/g_part_mbr.c
==============================================================================
--- head/sys/geom/part/g_part_mbr.c Wed Oct 13 11:23:27 2010
(r213768)
+++ head/sys/geom/part/g_part_mbr.c Wed Oct 13 11:35:59 2010
(r213769)
@@ -204,8 +204,8 @@ g_part_mbr_add(struct g_part_table *base
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;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
