X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Fclear_cmd.c;h=ef404a444d6eea6a1374ed592cbbd142821e7cb3;hp=0e1d85f5deaa8c4611fd211a03e45dec9a7610a3;hb=896224bea6196d73d03e39b1a266887d6f2cb6ff;hpb=0485620c03e69b1b58a6b12e5e45c98415fc7575;ds=inline diff --git a/progs/clear_cmd.c b/progs/clear_cmd.c index 0e1d85f5..ef404a44 100644 --- a/progs/clear_cmd.c +++ b/progs/clear_cmd.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2016,2017 Free Software Foundation, Inc. * + * Copyright (c) 2016-2017,2018 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 +37,7 @@ #define USE_LIBTINFO #include -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.4 2018/08/04 18:43:22 Nicholas.Marriott Exp $") static int putch(int c) @@ -48,14 +48,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; }