From nobody Tue Apr 12 21:59:34 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0BC371AFC6A4; Tue, 12 Apr 2022 21:59:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KdKPy4lTfz4hrM; Tue, 12 Apr 2022 21:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649800774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QiF/Zi1JjnVvxHvXvJ09zp4pucmoDiI/QXRdXJ7bRGs=; b=JwkoWBCxHpAy/Vp+yDYY+ZAGni+uchq0xIkqJVymMgAZaRJV8HyDmlca7x6RK6fv1QcqBO oJTjpX8K8DUPN7VhbttGclApKtrRdXW5U/pEnhF0z1BQ/fhBRnGWt4TJai/CiSmokjjGCX CYsj5I+MRvQYeRwGimB4elQOo4582fDT2RMNnOX3fvKZH4a1WhrOiOHWQSQadLKeabhg8w Q+GPXBpvU/wngBOiaQn/UKPY7A0XjNdXul3yqeSjMohXpAqQ4+ArR9MfxS1AFSfOzeUxLb +OJyXWb801ucVsGRkSv9SU1K0Y+YWEvC7GTnp9VFrVWBoSdG8xrjeMY8UUOocA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 840371F5CE; Tue, 12 Apr 2022 21:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23CLxYfN035705; Tue, 12 Apr 2022 21:59:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23CLxY7B035704; Tue, 12 Apr 2022 21:59:34 GMT (envelope-from git) Date: Tue, 12 Apr 2022 21:59:34 GMT Message-Id: <202204122159.23CLxY7B035704@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: fdf288f39db2 - main - sc: Move prev_ysize under #ifndef SC_NO_HISTORY. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fdf288f39db2daef815b44d09686043cf498cfae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649800774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QiF/Zi1JjnVvxHvXvJ09zp4pucmoDiI/QXRdXJ7bRGs=; b=d1YgWYwqitFYOn8DsIfcjnXShH/XkKL0cKu8HgyFQaBUnnN6DJj8O6d9en1BcpFuh+/aw9 2f1bpJGsEfA0MyJK0aJ7mlDWKfKNUHsWkl3ZVlvYp37KSnCN8z3axf0bU8hEmd7it2JI6/ /WVEF8jTqy+rsd2enmAKRNPTrItVLp0TJYYNvUBsIBkzE3Yob04sFyEGz+SSg2RGeuXQ8c NxHrjDmv7wWOVB2RkmzoqL8GxlDF3TG5YTdsD2e9sr2lRPRs2xhb2JsAUb+hzrqc1EbONB Qha4woI0zwLEFhZyqVXvTV8RM+ffaf8EbHx3wt2vn4NmpkScCYy0hcPn+cwQWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649800774; a=rsa-sha256; cv=none; b=TLA18LGTz9IAyBFEb+U3lSOr2lk/6qqldpbLGp1459qpRfDpYC7gCRA6Ly8SCsPdMSCXMR 7W1ktEdBTYYXyvvQL/YbdAMvbJW3yht5OX6Wpoea9OuE5oux2Lqrl7bv18ANWu7R5gsgxy s+dvfaeKhWmqdTCEBjX9kAlFADdCDZNlt3i8dQZr6ZsHdzRZiptTUG9HL03UC3PiRQFWdC KPV/U9uhqnc/XwHdPYSNcbTfgb0P+Cy+qxJSQPrzETGSVJosYfs+2cOcnEg+Ha1V6avLfW vkxqGf9eLokII54e6qpiAmE+hD8EyV5Uev83dfEfzulgHITZ4F1+lvUA2awlkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fdf288f39db2daef815b44d09686043cf498cfae commit fdf288f39db2daef815b44d09686043cf498cfae Author: John Baldwin AuthorDate: 2022-04-12 21:58:59 +0000 Commit: John Baldwin CommitDate: 2022-04-12 21:58:59 +0000 sc: Move prev_ysize under #ifndef SC_NO_HISTORY. --- sys/dev/syscons/scvidctl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c index 7c2b395d975b..222ed253c3ee 100644 --- a/sys/dev/syscons/scvidctl.c +++ b/sys/dev/syscons/scvidctl.c @@ -140,7 +140,9 @@ sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize, video_info_t info; struct winsize wsz; u_char *font; +#ifndef SC_NO_HISTORY int prev_ysize; +#endif int error; int s; @@ -200,8 +202,8 @@ sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize, #ifndef SC_NO_HISTORY if (scp->history != NULL) sc_hist_save(scp); -#endif prev_ysize = scp->ysize; +#endif /* * This is a kludge to fend off scrn_update() while we * muck around with scp. XXX @@ -384,8 +386,8 @@ sc_set_pixel_mode(scr_stat *scp, struct tty *tp, int xsize, int ysize, #ifndef SC_NO_HISTORY if (scp->history != NULL) sc_hist_save(scp); -#endif prev_ysize = scp->ysize; +#endif scp->status |= (UNKNOWN_MODE | PIXEL_MODE | MOUSE_HIDDEN); scp->status &= ~(GRAPHICS_MODE | MOUSE_VISIBLE); scp->xsize = xsize;