Module Name: src
Committed By: martin
Date: Tue Apr 26 18:50:53 UTC 2011
Modified Files:
src/tests/kernel/tty: t_pr.c
Log Message:
Simplify
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/kernel/tty/t_pr.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/kernel/tty/t_pr.c
diff -u src/tests/kernel/tty/t_pr.c:1.5 src/tests/kernel/tty/t_pr.c:1.6
--- src/tests/kernel/tty/t_pr.c:1.5 Sat Apr 9 11:55:59 2011
+++ src/tests/kernel/tty/t_pr.c Tue Apr 26 18:50:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pr.c,v 1.5 2011/04/09 11:55:59 martin Exp $ */
+/* $NetBSD: t_pr.c,v 1.6 2011/04/26 18:50:53 martin Exp $ */
#include <sys/types.h>
#include <sys/ioctl.h>
@@ -13,17 +13,6 @@
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
-static bool init_done = false;
-
-static void
-init(void)
-{
- if (init_done)
- return;
- rump_init();
- init_done = true;
-}
-
static int
sendsome(int from, int to)
{
@@ -89,7 +78,7 @@
{
int master, slave, error, v;
- init();
+ rump_init();
slave = rump_sys_open("/dev/ttyp1", O_RDWR|O_NONBLOCK);
ATF_CHECK(slave != -1);
@@ -117,7 +106,7 @@
{
int master, slave, error;
- init();
+ rump_init();
master = rump_sys_open("/dev/ptyp1", O_RDWR);
ATF_CHECK(master != -1);
@@ -144,7 +133,7 @@
struct termios tio;
int fd;
- init();
+ rump_init();
fd = rump_sys_open("/dev/ptyp1", O_RDWR);
ATF_CHECK(fd != -1);
