ncurses 6.2 - patch 20210313

[ncurses.git] / progs / clear_cmd.c

diff --git a/progs/clear_cmd.c b/progs/clear_cmd.c
index 0e1d85f5deaa8c4611fd211a03e45dec9a7610a3..3d80515c2e9744896cad937d435a3603a88f58e8 100644 (file)
--- a/progs/clear_cmd.c
+++ b/progs/clear_cmd.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2016,2017 Free Software Foundation, Inc.                   *
+ * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2016,2017 Free Software Foundation, Inc.                       *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -37,7 +38,7 @@
 #define USE_LIBTINFO
 #include <clear_cmd.h>
 
-MODULE_ID("$Id: clear_cmd.c,v 1.2 2017/08/19 13:37:24 tom Exp $")
+MODULE_ID("$Id: clear_cmd.c,v 1.5 2020/02/02 23:34:34 tom Exp $")
 
 static int
 putch(int c)
@@ -48,14 +49,12 @@ putch(int c)
 int
 clear_cmd(bool legacy)
 {
-    char *E3;
-
+    int retval = tputs(clear_screen, lines > 0 ? lines : 1, putch);
     if (!legacy) {
        /* Clear the scrollback buffer if possible. */
-       E3 = tigetstr("E3");
+       char *E3 = tigetstr("E3");
        if (E3)
            (void) tputs(E3, lines > 0 ? lines : 1, putch);
     }
-
-    return tputs(clear_screen, lines > 0 ? lines : 1, putch);
+    return retval;
 }