X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ffoldkeys.c;h=ba4d18cae42fafa29bdb3af7fad5fcddd35607f8;hp=bcda90c203aaa167d708a71022fda13555982f16;hb=461e72d1826483cb2c2cb243412f2dc5b00b2b1a;hpb=bfe3845eb1a2ff02a740e917b537e939ec4e44cb diff --git a/test/foldkeys.c b/test/foldkeys.c index bcda90c2..ba4d18ca 100644 --- a/test/foldkeys.c +++ b/test/foldkeys.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 2006-2017,2018 Free Software Foundation, Inc. * + * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2006-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 * @@ -29,7 +30,7 @@ /* * Author: Thomas E. Dickey, 2006 * - * $Id: foldkeys.c,v 1.7 2018/12/29 17:53:03 tom Exp $ + * $Id: foldkeys.c,v 1.10 2021/08/08 00:41:57 tom Exp $ * * Demonstrate a method for altering key definitions at runtime. * @@ -53,10 +54,10 @@ static void log_last_line(WINDOW *win) { FILE *fp; - int y, x, n; - char temp[256]; if ((fp = fopen(MY_LOGFILE, "a")) != 0) { + char temp[256]; + int y, x, n; int need = sizeof(temp) - 1; if (need > COLS) need = COLS; @@ -145,7 +146,8 @@ demo_foldkeys(void) int first, second; char final[2]; char *value; - size_t need = 0; + size_t need; + if (info[j].state == 0 && sscanf(info[j].value, "\033[%d;%d%c", @@ -155,6 +157,7 @@ demo_foldkeys(void) && *final != ';' && (need = strlen(info[j].value)) != 0 && (value = strdup(info[j].value)) != 0) { + (void) need; /* _nc_SLIMIT is normally nothing */ _nc_SPRINTF(value, _nc_SLIMIT(need) "\033[%d%c", first, *final); for (k = 0; k < info_len; ++k) { if (info[k].state == 0 @@ -195,8 +198,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) { int ch; #if HAVE_GETTIMEOFDAY - int secs, msecs; - struct timeval current, previous; + struct timeval previous; #endif if (newterm(0, stdout, stdin) == 0) { @@ -224,6 +226,9 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) const char *name = keyname(escaped ? (ch - MY_KEYS) : ch); #if HAVE_GETTIMEOFDAY + int secs, msecs; + struct timeval current; + gettimeofday(¤t, 0); secs = (int) (current.tv_sec - previous.tv_sec); msecs = (int) ((current.tv_usec - previous.tv_usec) / 1000);