[gentoo-commits] proj/openrc:0.20.x commit in: src/rc/, src/test/, test/, init.d/, scripts/, sh/

[gentoo-commits] proj/openrc:0.20.x commit in: src/rc/, src/test/, test/, init.d/, scripts/, sh/

[William Hubbs]

commit:     c79b6d47304e14685b3be516e203080bd77f22a4
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Jan 22 17:54:16 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 18:54:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=c79b6d47

fix tests

X-Gentoo-Bug: 572602
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=572602

 init.d/netmount.in   | 2 +-
 scripts/rc-sstat.in  | 6 +++---
 sh/openrc-run.sh.in  | 2 +-
 src/rc/rc-selinux.h  | 6 +++---
 src/rc/rc.c          | 2 +-
 src/test/runtests.sh | 3 +++
 test/setup_env.sh    | 4 ----
 7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 99e0dda..0acf15e 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -21,7 +21,7 @@ depend()
 		esac
 	done
  	config /etc/fstab
-	want $mywant	
+	want $mywant
 	use afc-client amd openvpn
 	use dns
 	keyword -jail -prefix -systemd-nspawn -vserver -lxc

diff --git a/scripts/rc-sstat.in b/scripts/rc-sstat.in
index 44dc9e0..a204dbd 100644
--- a/scripts/rc-sstat.in
+++ b/scripts/rc-sstat.in
@@ -52,8 +52,8 @@ if [ ! -d $scandir ]; then
 	exit 1
 fi
 
-# Make sure s6-svscan is running 
-if ! pgrep s6-svscan >/dev/null ; then 
+# Make sure s6-svscan is running
+if ! pgrep s6-svscan >/dev/null ; then
 	printf "s6-svscan is not running\n"
 	exit 1
 fi
@@ -141,7 +141,7 @@ do
 	fi
 done
 
-# Cleanup 
+# Cleanup
 rm -f $statfile 2>/dev/null
 
 printf "\n\n"

diff --git a/sh/openrc-run.sh.in b/sh/openrc-run.sh.in
index b393e94..fb6f95b 100644
--- a/sh/openrc-run.sh.in
+++ b/sh/openrc-run.sh.in
@@ -244,7 +244,7 @@ for _cmd; do
 		break
 	fi
 done
- 
+
 # Load our script
 sourcex "$RC_SERVICE"
 

diff --git a/src/rc/rc-selinux.h b/src/rc/rc-selinux.h
index 6bc1acc..c3258d9 100644
--- a/src/rc/rc-selinux.h
+++ b/src/rc/rc-selinux.h
@@ -25,10 +25,10 @@ void selinux_setup(char **argv);
 
 /* always return false for selinux_util_open() */
 #define selinux_util_open() (0)
-#define selinux_util_label(x) do { } while(0)
-#define selinux_util_close() do { } while(0)
+#define selinux_util_label(x) do { } while (0)
+#define selinux_util_close() do { } while (0)
 
-#define selinux_setup(x) do { } while(0)
+#define selinux_setup(x) do { } while (0)
 
 #endif
 

diff --git a/src/rc/rc.c b/src/rc/rc.c
index 7836341..4efa0cf 100644
--- a/src/rc/rc.c
+++ b/src/rc/rc.c
@@ -282,7 +282,7 @@ open_shell(void)
 
 #ifdef __linux__
 	const char *sys = rc_sys();
-	
+
 	/* VSERVER systems cannot really drop to shells */
 	if (sys && strcmp(sys, RC_SYS_VSERVER) == 0)
 	{

diff --git a/src/test/runtests.sh b/src/test/runtests.sh
index 5a87c84..1736dd5 100755
--- a/src/test/runtests.sh
+++ b/src/test/runtests.sh
@@ -85,12 +85,14 @@ eend $? "Trailing newlines need to be deleted:"$'\n'"${out}"
 
 ebegin "Checking for obsolete functions"
 out=$(cd ${top_srcdir}; find src -name '*.[ch]' \
+	! -name queue.h \
 	-exec grep -n -E '\<(malloc|memory|sys/(errno|fcntl|signal|stropts|termios|unistd))\.h\>' {} +)
 [ -z "${out}" ]
 eend $? "Avoid these obsolete functions:"$'\n'"${out}"
 
 ebegin "Checking for x* func usage"
 out=$(cd ${top_srcdir}; find src -name '*.[ch]' \
+	! -name queue.h \
 	-exec grep -n -E '\<(malloc|strdup)[[:space:]]*\(' {} + \
 	| grep -v \
 		-e src/includes/helpers.h \
@@ -100,6 +102,7 @@ eend $? "These need to be using the x* variant:"$'\n'"${out}"
 
 ebegin "Checking spacing style"
 out=$(cd ${top_srcdir}; find src -name '*.[ch]' \
+	! -name queue.h \
 	-exec grep -n -E \
 		-e '\<(for|if|switch|while)\(' \
 		-e '\<(for|if|switch|while) \( ' \

diff --git a/test/setup_env.sh b/test/setup_env.sh
index f7996ee..ffbd027 100755
--- a/test/setup_env.sh
+++ b/test/setup_env.sh
@@ -21,7 +21,3 @@ LD_LIBRARY_PATH=${top_builddir}/src/libeinfo:${top_builddir}/src/librc:${LD_LIBR
 PATH=${top_builddir}/src/rc:${PATH}
 export LD_LIBRARY_PATH PATH
 
-cd ${top_srcdir}/src/rc
-${MAKE:-make} links >/dev/null
-cd -
-