From owner-svn-src-all@freebsd.org Wed May 16 18:12:50 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1A74BEA86ED; Wed, 16 May 2018 18:12:50 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A93477494E; Wed, 16 May 2018 18:12:49 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8B0A31DB2C; Wed, 16 May 2018 18:12:49 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4GICnCI038113; Wed, 16 May 2018 18:12:49 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4GICnwN038112; Wed, 16 May 2018 18:12:49 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201805161812.w4GICnwN038112@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Wed, 16 May 2018 18:12:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333683 - head/sys/teken X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/sys/teken X-SVN-Commit-Revision: 333683 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 May 2018 18:12:50 -0000 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