Date: Wed, 16 May 2018 18:12:49 +0000 (UTC) From: Conrad Meyer <cem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333683 - head/sys/teken Message-ID: <201805161812.w4GICnwN038112@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cem Date: Wed May 16 18:12:49 2018 New Revision: 333683 URL: https://svnweb.freebsd.org/changeset/base/333683 Log: teken: Unbreak syscons' use of teken Only vt(4) initializes these callbacks non-NULL at this time, so invoke the function pointers conditionally. Broken in r333669. Submitted by: bde@ Modified: head/sys/teken/teken.c Modified: head/sys/teken/teken.c ============================================================================== --- head/sys/teken/teken.c Wed May 16 17:55:16 2018 (r333682) +++ head/sys/teken/teken.c Wed May 16 18:12:49 2018 (r333683) @@ -136,16 +136,16 @@ static inline void teken_funcs_pre_input(const teken_t *t) { - teken_assert(t->t_funcs->tf_pre_input != NULL); - t->t_funcs->tf_pre_input(t->t_softc); + if (t->t_funcs->tf_pre_input != NULL) + t->t_funcs->tf_pre_input(t->t_softc); } static inline void teken_funcs_post_input(const teken_t *t) { - teken_assert(t->t_funcs->tf_post_input != NULL); - t->t_funcs->tf_post_input(t->t_softc); + if (t->t_funcs->tf_post_input != NULL) + t->t_funcs->tf_post_input(t->t_softc); } static inline void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805161812.w4GICnwN038112>