Module Name: src
Committed By: rillig
Date: Tue Feb 9 20:42:31 UTC 2021
Modified Files:
src/tests/lib/libcurses: t_curses.sh
src/tests/lib/libcurses/director: director.c testlang_parse.y
src/tests/lib/libcurses/slave: commands.c slave.c
Log Message:
tests/libcurses: add missing space after control flow keywords
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/tests/lib/libcurses/t_curses.sh
cvs rdiff -u -r1.17 -r1.18 src/tests/lib/libcurses/director/director.c
cvs rdiff -u -r1.43 -r1.44 src/tests/lib/libcurses/director/testlang_parse.y
cvs rdiff -u -r1.9 -r1.10 src/tests/lib/libcurses/slave/commands.c \
src/tests/lib/libcurses/slave/slave.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libcurses/t_curses.sh
diff -u src/tests/lib/libcurses/t_curses.sh:1.20 src/tests/lib/libcurses/t_curses.sh:1.21
--- src/tests/lib/libcurses/t_curses.sh:1.20 Thu Oct 29 00:27:50 2020
+++ src/tests/lib/libcurses/t_curses.sh Tue Feb 9 20:42:31 2021
@@ -1,4 +1,5 @@
-h_run(){
+h_run()
+{
file=$1
if [ -z "$2" ]; then
export LC_ALL=C
Index: src/tests/lib/libcurses/director/director.c
diff -u src/tests/lib/libcurses/director/director.c:1.17 src/tests/lib/libcurses/director/director.c:1.18
--- src/tests/lib/libcurses/director/director.c:1.17 Mon Feb 8 19:15:20 2021
+++ src/tests/lib/libcurses/director/director.c Tue Feb 9 20:42:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: director.c,v 1.17 2021/02/08 19:15:20 rillig Exp $ */
+/* $NetBSD: director.c,v 1.18 2021/02/09 20:42:31 rillig Exp $ */
/*-
* Copyright 2009 Brett Lymn <bl...@netbsd.org>
@@ -142,7 +142,7 @@ main(int argc, char *argv[])
check_file_flag = 0;
while ((ch = getopt(argc, argv, "vgfC:I:p:s:t:T:")) != -1) {
- switch(ch) {
+ switch (ch) {
case 'I':
include_path = optarg;
break;
Index: src/tests/lib/libcurses/director/testlang_parse.y
diff -u src/tests/lib/libcurses/director/testlang_parse.y:1.43 src/tests/lib/libcurses/director/testlang_parse.y:1.44
--- src/tests/lib/libcurses/director/testlang_parse.y:1.43 Mon Feb 8 23:54:03 2021
+++ src/tests/lib/libcurses/director/testlang_parse.y Tue Feb 9 20:42:31 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: testlang_parse.y,v 1.43 2021/02/08 23:54:03 rillig Exp $ */
+/* $NetBSD: testlang_parse.y,v 1.44 2021/02/09 20:42:31 rillig Exp $ */
/*-
* Copyright 2009 Brett Lymn <bl...@netbsd.org>
@@ -1116,7 +1116,7 @@ do_function_call(size_t nresults)
fds[1].events = POLLOUT;
p = input_str;
save_slave_output(false);
- while(*p != '\0') {
+ while (*p != '\0') {
perform_delay(&delay_spec);
if (poll(fds, 2, 0) < 0)
@@ -1774,11 +1774,11 @@ validate_wchar(wchar_t *expected, wchar_
wchar_t *p;
p = expected;
- while(*p++ != L'\0')
+ while (*p++ != L'\0')
len1++;
p = value;
- while(*p++ != L'\0')
+ while (*p++ != L'\0')
len2++;
/*
@@ -2036,7 +2036,7 @@ read_cmd_pipe(ct_data_t *response)
save_slave_output(false);
}
}
- while((rfd[1].revents & POLLIN) == POLLIN);
+ while ((rfd[1].revents & POLLIN) == POLLIN);
if (read(slvpipe[READ_PIPE], &type, sizeof(int)) < 0)
err(1, "command pipe read for type failed");
Index: src/tests/lib/libcurses/slave/commands.c
diff -u src/tests/lib/libcurses/slave/commands.c:1.9 src/tests/lib/libcurses/slave/commands.c:1.10
--- src/tests/lib/libcurses/slave/commands.c:1.9 Tue Feb 9 20:39:20 2021
+++ src/tests/lib/libcurses/slave/commands.c Tue Feb 9 20:42:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: commands.c,v 1.9 2021/02/09 20:39:20 rillig Exp $ */
+/* $NetBSD: commands.c,v 1.10 2021/02/09 20:42:31 rillig Exp $ */
/*-
* Copyright 2009 Brett Lymn <bl...@netbsd.org>
@@ -61,7 +61,7 @@ command_execute(char *func, int nargs, c
if (strcmp(func, commands[i].name) == 0) {
/* Check only restricted set of functions is called before
* initscr/newterm */
- if (!initdone){
+ if (!initdone) {
j = 0;
while (j < nrcmds) {
if (strcmp(func, restricted_commands[j]) == 0) {
Index: src/tests/lib/libcurses/slave/slave.c
diff -u src/tests/lib/libcurses/slave/slave.c:1.9 src/tests/lib/libcurses/slave/slave.c:1.10
--- src/tests/lib/libcurses/slave/slave.c:1.9 Mon Feb 8 19:15:21 2021
+++ src/tests/lib/libcurses/slave/slave.c Tue Feb 9 20:42:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: slave.c,v 1.9 2021/02/08 19:15:21 rillig Exp $ */
+/* $NetBSD: slave.c,v 1.10 2021/02/09 20:42:31 rillig Exp $ */
/*-
* Copyright 2009 Brett Lymn <bl...@netbsd.org>
@@ -64,7 +64,7 @@ process_commands(void)
if ((cmdbuf = malloc(maxlen)) == NULL)
err(1, "slave cmdbuf malloc failed");
- while(1) {
+ while (1) {
if (read(cmdpipe[READ_PIPE], &type, sizeof(int)) < 0)
err(1, "slave command type read failed");
@@ -140,7 +140,7 @@ process_commands(void)
argslen++;
}
}
- while(len >= 0);
+ while (len >= 0);
command_execute(cmdbuf, argslen, args);
