[src/trunk]: src/tests/lib/libcurses tests/libcurses: clean up inclusion guar...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/99e29fa30df8
branches:  trunk
changeset: 952333:99e29fa30df8
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Feb 13 08:14:46 2021 +0000

description:
tests/libcurses: clean up inclusion guards, function declarations

No functional change.

diffstat:

 tests/lib/libcurses/director/director.c       |   5 ++---
 tests/lib/libcurses/director/director.h       |  12 ++++++------
 tests/lib/libcurses/director/returns.h        |  11 +++++------
 tests/lib/libcurses/director/testlang_conf.l  |   5 ++---
 tests/lib/libcurses/director/testlang_parse.y |   6 +++---
 tests/lib/libcurses/slave/command_table.h     |  12 ++++++------
 tests/lib/libcurses/slave/commands.c          |   6 +++---
 tests/lib/libcurses/slave/curses_commands.c   |   5 ++---
 tests/lib/libcurses/slave/curses_commands.h   |  13 ++++---------
 9 files changed, 33 insertions(+), 42 deletions(-)

diffs (264 lines):

diff -r 07cb5152c803 -r 99e29fa30df8 tests/lib/libcurses/director/director.c
--- a/tests/lib/libcurses/director/director.c   Sat Feb 13 08:00:07 2021 +0000
+++ b/tests/lib/libcurses/director/director.c   Sat Feb 13 08:14:46 2021 +0000
@@ -1,7 +1,8 @@
-/*     $NetBSD: director.c,v 1.24 2021/02/13 08:00:07 rillig Exp $     */
+/*     $NetBSD: director.c,v 1.25 2021/02/13 08:14:46 rillig Exp $     */
 
 /*-
  * Copyright 2009 Brett Lymn <blymn%NetBSD.org@localhost>
+ * Copyright 2021 Roland Illig <rillig%NetBSD.org@localhost>
  *
  * All rights reserved.
  *
@@ -25,8 +26,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
  */
 
 #include <sys/param.h>
diff -r 07cb5152c803 -r 99e29fa30df8 tests/lib/libcurses/director/director.h
--- a/tests/lib/libcurses/director/director.h   Sat Feb 13 08:00:07 2021 +0000
+++ b/tests/lib/libcurses/director/director.h   Sat Feb 13 08:14:46 2021 +0000
@@ -1,8 +1,9 @@
-/*     $NetBSD: director.h,v 1.3 2021/02/13 07:08:45 rillig Exp $      */
+/*     $NetBSD: director.h,v 1.4 2021/02/13 08:14:46 rillig Exp $      */
 
 /*-
  * Copyright 2020 Naman Jain <jnaman806%gmail.com@localhost>, this code was
  * created as part of the Google Summer of Code 2020.
+ * Copyright 2021 Roland Illig <rillig%NetBSD.org@localhost>
  *
  * All rights reserved.
  *
@@ -26,11 +27,10 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
  */
-#ifndef DIRECTOR_H
-#define DIRECTOR_H
+
+#ifndef CTF_DIRECTOR_H
+#define CTF_DIRECTOR_H
 
 #define GEN_CHECK_FILE 1
 #define FORCE_GEN 2
@@ -38,4 +38,4 @@
 extern int to_slave;
 extern int from_slave;
 
-#endif /* DIRECTOR_H */
+#endif
diff -r 07cb5152c803 -r 99e29fa30df8 tests/lib/libcurses/director/returns.h
--- a/tests/lib/libcurses/director/returns.h    Sat Feb 13 08:00:07 2021 +0000
+++ b/tests/lib/libcurses/director/returns.h    Sat Feb 13 08:14:46 2021 +0000
@@ -1,7 +1,8 @@
-/*     $NetBSD: returns.h,v 1.5 2021/02/08 19:15:20 rillig Exp $       */
+/*     $NetBSD: returns.h,v 1.6 2021/02/13 08:14:46 rillig Exp $       */
 
 /*-
  * Copyright 2009 Brett Lymn <blymn%NetBSD.org@localhost>
+ * Copyright 2021 Roland Illig <rillig%NetBSD.org@localhost>
  *
  * All rights reserved.
  *
@@ -25,12 +26,10 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
  */
+
 #ifndef CTF_RETURNS_H
-#define CTF_RETURNS_H 1
-
+#define CTF_RETURNS_H
 
 typedef enum {
        data_number = 1,
@@ -66,4 +65,4 @@
        char    *data;
 } saved_data_t;
 
-#endif /* CTF_RETURNS_H */
+#endif
diff -r 07cb5152c803 -r 99e29fa30df8 tests/lib/libcurses/director/testlang_conf.l
--- a/tests/lib/libcurses/director/testlang_conf.l      Sat Feb 13 08:00:07 2021 +0000
+++ b/tests/lib/libcurses/director/testlang_conf.l      Sat Feb 13 08:14:46 2021 +0000
@@ -1,8 +1,9 @@
 %{
-/*     $NetBSD: testlang_conf.l,v 1.19 2021/02/13 08:00:07 rillig Exp $        */
+/*     $NetBSD: testlang_conf.l,v 1.20 2021/02/13 08:14:46 rillig Exp $        */
 
 /*-
  * Copyright 2009 Brett Lymn <blymn%NetBSD.org@localhost>
+ * Copyright 2021 Roland Illig <rillig%NetBSD.org@localhost>
  *
  * All rights reserved.
  *
@@ -26,8 +27,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
  */
 
 #include <curses.h>
diff -r 07cb5152c803 -r 99e29fa30df8 tests/lib/libcurses/director/testlang_parse.y
--- a/tests/lib/libcurses/director/testlang_parse.y     Sat Feb 13 08:00:07 2021 +0000
+++ b/tests/lib/libcurses/director/testlang_parse.y     Sat Feb 13 08:14:46 2021 +0000
@@ -1,8 +1,9 @@
 %{
-/*     $NetBSD: testlang_parse.y,v 1.45 2021/02/13 07:08:45 rillig Exp $       */
+/*     $NetBSD: testlang_parse.y,v 1.46 2021/02/13 08:14:46 rillig Exp $       */
 
 /*-
  * Copyright 2009 Brett Lymn <blymn%NetBSD.org@localhost>
+ * Copyright 2021 Roland Illig <rillig%NetBSD.org@localhost>
  *
  * All rights reserved.
  *
@@ -26,9 +27,8 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
  */
+
 #include <assert.h>
 #include <curses.h>
 #include <errno.h>
diff -r 07cb5152c803 -r 99e29fa30df8 tests/lib/libcurses/slave/command_table.h
--- a/tests/lib/libcurses/slave/command_table.h Sat Feb 13 08:00:07 2021 +0000
+++ b/tests/lib/libcurses/slave/command_table.h Sat Feb 13 08:14:46 2021 +0000
@@ -1,7 +1,8 @@
-/*     $NetBSD: command_table.h,v 1.6 2021/02/12 21:29:03 rillig Exp $ */
+/*     $NetBSD: command_table.h,v 1.7 2021/02/13 08:14:46 rillig Exp $ */
 
 /*-
  * Copyright 2009 Brett Lymn <blymn%NetBSD.org@localhost>
+ * Copyright 2021 Roland Illig <rillig%NetBSD.org@localhost>
  *
  * All rights reserved.
  *
@@ -25,16 +26,15 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
  */
 
-#ifndef _COMMAND_TABLE_H_
-#define        _COMMAND_TABLE_H_
+#ifndef CTF_COMMAND_TABLE_H
+#define        CTF_COMMAND_TABLE_H
 
 #include "curses_commands.h"
 
-static const char *restricted_commands[] = { "filter", "ripoffline", "use_env",
+static const char *restricted_commands[] = {
+       "filter", "ripoffline", "use_env",
        "slk_init", "initscr", "newterm"
 };
 
diff -r 07cb5152c803 -r 99e29fa30df8 tests/lib/libcurses/slave/commands.c
--- a/tests/lib/libcurses/slave/commands.c      Sat Feb 13 08:00:07 2021 +0000
+++ b/tests/lib/libcurses/slave/commands.c      Sat Feb 13 08:14:46 2021 +0000
@@ -1,7 +1,8 @@
-/*     $NetBSD: commands.c,v 1.11 2021/02/13 06:45:42 rillig Exp $     */
+/*     $NetBSD: commands.c,v 1.12 2021/02/13 08:14:46 rillig Exp $     */
 
 /*-
  * Copyright 2009 Brett Lymn <blymn%NetBSD.org@localhost>
+ * Copyright 2021 Roland Illig <rillig%NetBSD.org@localhost>
  *
  * All rights reserved.
  *
@@ -25,8 +26,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
  */
 
 #include <curses.h>
@@ -36,6 +35,7 @@
 #include <unistd.h>
 #include <err.h>
 #include <sys/types.h>
+
 #include "returns.h"
 #include "slave.h"
 #include "command_table.h"
diff -r 07cb5152c803 -r 99e29fa30df8 tests/lib/libcurses/slave/curses_commands.c
--- a/tests/lib/libcurses/slave/curses_commands.c       Sat Feb 13 08:00:07 2021 +0000
+++ b/tests/lib/libcurses/slave/curses_commands.c       Sat Feb 13 08:14:46 2021 +0000
@@ -1,7 +1,8 @@
-/*     $NetBSD: curses_commands.c,v 1.21 2021/02/12 20:45:00 rillig Exp $      */
+/*     $NetBSD: curses_commands.c,v 1.22 2021/02/13 08:14:46 rillig Exp $      */
 
 /*-
  * Copyright 2009 Brett Lymn <blymn%NetBSD.org@localhost>
+ * Copyright 2021 Roland Illig <rillig%NetBSD.org@localhost>
  *
  * All rights reserved.
  *
@@ -25,8 +26,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
  */
 
 #include <curses.h>
diff -r 07cb5152c803 -r 99e29fa30df8 tests/lib/libcurses/slave/curses_commands.h
--- a/tests/lib/libcurses/slave/curses_commands.h       Sat Feb 13 08:00:07 2021 +0000
+++ b/tests/lib/libcurses/slave/curses_commands.h       Sat Feb 13 08:14:46 2021 +0000
@@ -1,7 +1,8 @@
-/*     $NetBSD: curses_commands.h,v 1.6 2021/02/12 21:29:03 rillig Exp $       */
+/*     $NetBSD: curses_commands.h,v 1.7 2021/02/13 08:14:46 rillig Exp $       */
 
 /*-
  * Copyright 2009 Brett Lymn <blymn%NetBSD.org@localhost>
+ * Copyright 2021 Roland Illig <rillig%NetBSD.org@localhost>
  *
  * All rights reserved.
  *
@@ -25,12 +26,10 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
  */
 
-#ifndef _CURSES_COMMANDS_H_
-#define        _CURSES_COMMANDS_H_
+#ifndef CTF_CURSES_COMMANDS_H
+#define        CTF_CURSES_COMMANDS_H
 
 struct command_def {
        const char *name;
@@ -324,10 +323,6 @@
 void cmd_winsnstr(int, char **);
 void cmd_winsstr(int, char **);
 
-void cmd_chgat(int, char **);
-void cmd_wchgat(int, char **);
-void cmd_mvchgat(int, char **);
-void cmd_mvwchgat(int, char **);
 void cmd_add_wch(int, char **);
 void cmd_wadd_wch(int, char **);
 void cmd_mvadd_wch(int, char **);