d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The canonical way to print __func__ when using KASSERT() is to write

Browse Source 
("%s", __func__). This avoids clang's -Wformat-string warnings.
This commit is contained in:
rpaulo 2010-10-13 11:35:59 +00:00
parent 01eca72a5f
commit 7bca860ea7
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/geom/part/g_part.c
View File

@ -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);

4
sys/geom/part/g_part_ebr.c
View File

@ -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;

4
sys/geom/part/g_part_mbr.c
View File

@ -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;