MFH: r508980

Fix two mismatches between function declaration and definition.

In both cases, function pointer arguments were inconsistently declared
and the result worked because of C's odd rules around function pointer
(de)references. With a stricter compiler these fail to compile.

Reported by: pfg@
Obtained from: base r350049 by brooks@ from CheriBSD
Differential Revision: https://reviews.freebsd.org/D20964
Approved by: portmgr (miwi@)