Prefer not_reached() over assert(false) where appropriate.

This commit is contained in:
Jason Evans
2013-10-21 14:56:27 -07:00
parent 0135fb806e
commit 6556e28be1
5 changed files with 12 additions and 13 deletions

View File

@@ -484,8 +484,7 @@ malloc_conf_init(void)
}
break;
} default:
/* NOTREACHED */
assert(false);
not_reached();
buf[0] = '\0';
opts = buf;
}

View File

@@ -423,7 +423,7 @@ prof_backtrace(prof_bt_t *bt, unsigned nignore)
{
cassert(config_prof);
assert(false);
not_reached();
}
#endif
@@ -511,7 +511,7 @@ prof_lookup(prof_bt_t *bt)
assert(ret.v != NULL);
if (ckh_remove(&prof_tdata->bt2cnt, ret.p->ctx->bt,
NULL, NULL))
assert(false);
not_reached();
ql_remove(&prof_tdata->lru_ql, ret.p, lru_link);
prof_ctx_merge(ret.p->ctx, ret.p);
/* ret can now be re-used. */
@@ -695,7 +695,7 @@ prof_ctx_destroy(prof_ctx_t *ctx)
assert(ctx->cnt_merged.accumbytes == 0);
/* Remove ctx from bt2ctx. */
if (ckh_remove(&bt2ctx, ctx->bt, NULL, NULL))
assert(false);
not_reached();
prof_leave(prof_tdata);
/* Destroy ctx. */
malloc_mutex_unlock(ctx->lock);

View File

@@ -554,7 +554,7 @@ malloc_vsnprintf(char *str, size_t size, const char *format, va_list ap)
f++;
break;
}
default: not_implemented();
default: not_reached();
}
break;
} default: {

View File

@@ -137,7 +137,7 @@ zone_destroy(malloc_zone_t *zone)
{
/* This function should never be called. */
assert(false);
not_reached();
return (NULL);
}