summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2017-05-23 08:02:21 +0000
committertrasz <trasz@FreeBSD.org>2017-05-23 08:02:21 +0000
commita7a68f69f2bd959c88960d264942a672e7b85ff0 (patch)
tree63a64328003b9ae5815c5cb5fa5f155cf5e3905f /usr.bin
parent98fb76ac6235ea32698de86dc77309daafde9760 (diff)
downloadFreeBSD-src-a7a68f69f2bd959c88960d264942a672e7b85ff0.zip
FreeBSD-src-a7a68f69f2bd959c88960d264942a672e7b85ff0.tar.gz
MFC r317905:
Rename a variable, hopefully fixing build after r317901.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/resizewin/resizewin.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/resizewin/resizewin.c b/usr.bin/resizewin/resizewin.c
index 8bfa786..89a2b1b 100644
--- a/usr.bin/resizewin/resizewin.c
+++ b/usr.bin/resizewin/resizewin.c
@@ -52,11 +52,11 @@ main(__unused int argc, __unused char **argv)
{
struct termios old, new;
struct winsize w;
- int ret, fd, cnt, err;
+ int ret, fd, cnt, error;
char data[20];
struct timeval then, now;
- err = 0;
+ error = 0;
if ((fd = open("/dev/tty", O_RDWR | O_NONBLOCK)) == -1)
exit(1);
@@ -72,7 +72,7 @@ main(__unused int argc, __unused char **argv)
exit(1);
if (write(fd, query, sizeof(query)) != sizeof(query)) {
- err = 1;
+ error = 1;
goto out;
}
@@ -89,14 +89,14 @@ main(__unused int argc, __unused char **argv)
timersub(&now, &then, &now);
if (now.tv_sec >= 2) {
warnx("timeout reading from terminal");
- err = 1;
+ error = 1;
goto out;
}
usleep(20000);
continue;
}
- err = 1;
+ error = 1;
goto out;
}
if (data[cnt] == 'R')
@@ -105,25 +105,25 @@ main(__unused int argc, __unused char **argv)
cnt++;
if (cnt == sizeof(data) - 2) {
warnx("response too long");
- err = 1;
+ error = 1;
goto out;
}
}
/* Parse */
if (sscanf(data, "\033[%hu;%huR", &w.ws_row, &w.ws_col) != 2) {
- err = 1;
+ error = 1;
warnx("unable to parse response");
goto out;
}
/* Finally, what we want */
if (ioctl(fd, TIOCSWINSZ, &w) == -1)
- err = 1;
+ error = 1;
out:
/* Restore echo */
tcsetattr(fd, TCSANOW, &old);
close(fd);
- exit(err);
+ exit(error);
}
OpenPOWER on IntegriCloud