From 87e36d247ebc207ee52330a864856db2ec422b72 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Mon, 20 Mar 2017 22:05:27 +0000
Subject: elide compiler stupidity.

---
 tetris/screen.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'tetris')

diff --git a/tetris/screen.c b/tetris/screen.c
index 193b2c6a..bc065aaa 100644
--- a/tetris/screen.c
+++ b/tetris/screen.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: screen.c,v 1.32 2016/03/03 21:38:55 nat Exp $	*/
+/*	$NetBSD: screen.c,v 1.33 2017/03/20 22:05:27 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -212,10 +212,11 @@ scr_set(void)
 	 * We made it.  We are now in screen mode, modulo TIstr
 	 * (which we will fix immediately).
 	 */
-	if (enter_ca_mode)
-		putstr(enter_ca_mode);
-	if (cursor_invisible)
-		putstr(cursor_invisible);
+	const char *tstr;
+	if ((tstr = enter_ca_mode) != NULL)
+		putstr(tstr);
+	if ((tstr = cursor_invisible) != NULL)
+		putstr(tstr);
 	if (tstp != SIG_IGN)
 		(void) signal(SIGTSTP, scr_stop);
 	if (ttou != SIG_IGN)
@@ -239,15 +240,16 @@ scr_end(void)
 	sigaddset(&nsigset, SIGTTOU);
 	(void) sigprocmask(SIG_BLOCK, &nsigset, &osigset);
 	/* move cursor to last line */
-	if (cursor_to_ll)
-		putstr(cursor_to_ll);
+	const char *tstr;
+	if ((tstr = cursor_to_ll) != NULL)
+		putstr(tstr);
 	else
 		moveto(Rows - 1, 0);
 	/* exit screen mode */
-	if (exit_ca_mode)
-		putstr(exit_ca_mode);
-	if (cursor_normal)
-		putstr(cursor_normal);
+	if ((tstr = exit_ca_mode) != NULL)
+		putstr(tstr);
+	if ((tstr = cursor_normal) != NULL)
+		putstr(tstr);
 	(void) fflush(stdout);
 	(void) tcsetattr(0, TCSADRAIN, &oldtt);
 	isset = 0;
-- 
cgit v1.2.3-56-ge451