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

Cast values to (int) before comparing them to the range of the

Browse Source 
enum. This ensures they are in range w/o the warnings.
This commit is contained in:
Warner Losh 2017-02-24 01:39:12 +00:00
parent df1c30f6bd
commit bbf6e5144e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/kern_pmc.c
View File

@ -287,8 +287,8 @@ pmc_soft_ev_deregister(struct pmc_soft *ps)
if (ps->ps_ev.pm_ev_code != 0 && if (ps->ps_ev.pm_ev_code != 0 &&
(ps->ps_ev.pm_ev_code - PMC_EV_SOFT_FIRST) < pmc_softevents) { (ps->ps_ev.pm_ev_code - PMC_EV_SOFT_FIRST) < pmc_softevents) {
KASSERT(ps->ps_ev.pm_ev_code >= PMC_EV_SOFT_FIRST && KASSERT((int)ps->ps_ev.pm_ev_code >= PMC_EV_SOFT_FIRST &&
ps->ps_ev.pm_ev_code <= PMC_EV_SOFT_LAST, (int)ps->ps_ev.pm_ev_code <= PMC_EV_SOFT_LAST,
("pmc_soft_deregister: invalid event value")); ("pmc_soft_deregister: invalid event value"));
pmc_softs[ps->ps_ev.pm_ev_code - PMC_EV_SOFT_FIRST] = NULL; pmc_softs[ps->ps_ev.pm_ev_code - PMC_EV_SOFT_FIRST] = NULL;
} }
@ -304,8 +304,8 @@ pmc_soft_ev_acquire(enum pmc_event ev)
if (ev == 0 || (ev - PMC_EV_SOFT_FIRST) >= pmc_softevents) if (ev == 0 || (ev - PMC_EV_SOFT_FIRST) >= pmc_softevents)
return NULL; return NULL;
KASSERT(ev >= PMC_EV_SOFT_FIRST && KASSERT((int)ev >= PMC_EV_SOFT_FIRST &&
ev <= PMC_EV_SOFT_LAST, (int)ev <= PMC_EV_SOFT_LAST,
("event out of range")); ("event out of range"));
mtx_lock_spin(&pmc_softs_mtx); mtx_lock_spin(&pmc_softs_mtx);