[gentoo-commits] proj/openrc:master commit in: src/rc/, src/librc/

[gentoo-commits] proj/openrc:master commit in: src/rc/, src/librc/

[William Hubbs]

commit:     3f82edbeb9251149c6aff071d6537379af4e5eea
Author:     Svante Signell <svante.signell <AT> gmail <DOT> com>
AuthorDate: Tue Oct 21 06:53:37 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Oct 22 16:05:07 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3f82edbe

Fix GNU/kFreeBSD port

Check for __FreeBSD_kernel instead of __GLIBC__ in source files.

note from William Hubbs:
I was told this is a better check for GNU/kFreeBSD than checking the
C  library the source is being compiled against.
GNU/kFreeBSD than checking which library we are using.

---
 src/librc/librc-daemon.c | 2 +-
 src/rc/mountinfo.c       | 4 ++--
 src/rc/rc-logger.c       | 2 +-
 src/rc/runscript.c       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/librc/librc-daemon.c b/src/librc/librc-daemon.c
index 04f25b1..9970315 100644
--- a/src/librc/librc-daemon.c
+++ b/src/librc/librc-daemon.c
@@ -30,7 +30,7 @@
 
 #include "librc.h"
 
-#if defined(__linux__) || defined (__GLIBC__)
+#if defined(__linux__) || defined (__FreeBSD_kernel__)
 static bool
 pid_is_exec(pid_t pid, const char *exec)
 {

diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c
index ce3f27d..7840987 100644
--- a/src/rc/mountinfo.c
+++ b/src/rc/mountinfo.c
@@ -39,7 +39,7 @@
 #  include <sys/statvfs.h>
 #  define statfs statvfs
 #  define F_FLAGS f_flag
-#elif defined (__linux__) || defined (__GLIBC__)
+#elif defined (__linux__) || defined (__FreeBSD_kernel__)
 #  include <mntent.h>
 #endif
 
@@ -265,7 +265,7 @@ find_mounts(struct args *args)
 	return list;
 }
 
-#elif defined (__linux__) || defined (__GLIBC__)
+#elif defined (__linux__) || defined (__FreeBSD_kernel__)
 static struct mntent *
 getmntfile(const char *file)
 {

diff --git a/src/rc/rc-logger.c b/src/rc/rc-logger.c
index e8fb0ff..50cf618 100644
--- a/src/rc/rc-logger.c
+++ b/src/rc/rc-logger.c
@@ -44,7 +44,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#if defined(__linux__) || defined(__GLIBC__)
+#if defined(__linux__) || defined(__FreeBSD_kernel__)
 #  include <pty.h>
 #elif defined(__NetBSD__) || defined(__OpenBSD__)
 #  include <util.h>

diff --git a/src/rc/runscript.c b/src/rc/runscript.c
index de18f90..96aa683 100644
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -51,7 +51,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#if defined(__linux__) || defined(__GLIBC__)
+#if defined(__linux__) || defined(__FreeBSD_kernel__)
 #  include <pty.h>
 #elif defined(__NetBSD__) || defined(__OpenBSD__)
 #  include <util.h>

[gentoo-commits] proj/openrc:master commit in: src/rc/, src/librc/

[William Hubbs]

commit:     c304522131a795cf882444b5f94e81db4baf65b3
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 23:18:35 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 23:18:35 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=c3045221

Clean up warnings that can use the _unused macro

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

 src/librc/librc-misc.c     | 3 ++-
 src/librc/librc.c          | 5 +++--
 src/rc/start-stop-daemon.c | 5 ++++-
 src/rc/supervise-daemon.c  | 4 +++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/librc/librc-misc.c b/src/librc/librc-misc.c
index 45bdb7a..9d514bc 100644
--- a/src/librc/librc-misc.c
+++ b/src/librc/librc-misc.c
@@ -19,6 +19,7 @@
 
 #include "queue.h"
 #include "librc.h"
+#include "helpers.h"
 
 bool
 rc_yesno(const char *value)
@@ -118,7 +119,7 @@ rc_getline(char **line, size_t *len, FILE *fp)
 librc_hidden_def(rc_getline)
 
 char *
-rc_proc_getent(const char *ent)
+rc_proc_getent(const char *ent _unused)
 {
 #ifdef __linux__
 	FILE *fp;

diff --git a/src/librc/librc.c b/src/librc/librc.c
index 3d3277d..84c76b5 100644
--- a/src/librc/librc.c
+++ b/src/librc/librc.c
@@ -19,6 +19,7 @@ const char librc_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
 
 #include "queue.h"
 #include "librc.h"
+#include <helpers.h>
 #ifdef __FreeBSD__
 #  include <sys/sysctl.h>
 #endif
@@ -232,7 +233,7 @@ detect_prefix(const char *systype)
 }
 
 static const char *
-detect_container(const char *systype)
+detect_container(const char *systype _unused)
 {
 #ifdef __FreeBSD__
 	if (systype) {
@@ -296,7 +297,7 @@ detect_container(const char *systype)
 }
 
 static const char *
-detect_vm(const char *systype)
+detect_vm(const char *systype _unused)
 {
 #ifdef __NetBSD__
 	if (systype) {

diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c
index eb5b4f7..b1c6e73 100644
--- a/src/rc/start-stop-daemon.c
+++ b/src/rc/start-stop-daemon.c
@@ -64,6 +64,7 @@ static struct pam_conv conv = { NULL, NULL};
 #include "rc.h"
 #include "rc-misc.h"
 #include "_usage.h"
+#include "helpers.h"
 
 const char *applet = NULL;
 const char *extraopts = NULL;
@@ -153,7 +154,9 @@ extern char **environ;
 # define SYS_ioprio_set __NR_ioprio_set
 #endif
 #if !defined(__DragonFly__)
-static inline int ioprio_set(int which, int who, int ioprio)
+static inline int ioprio_set(int which _unused,
+			     int who _unused,
+			     int ioprio _unused)
 {
 #ifdef SYS_ioprio_set
 	return syscall(SYS_ioprio_set, which, who, ioprio);

diff --git a/src/rc/supervise-daemon.c b/src/rc/supervise-daemon.c
index a47e47d..57d5519 100644
--- a/src/rc/supervise-daemon.c
+++ b/src/rc/supervise-daemon.c
@@ -62,6 +62,7 @@ static struct pam_conv conv = { NULL, NULL};
 #include "rc.h"
 #include "rc-misc.h"
 #include "_usage.h"
+#include "helpers.h"
 
 const char *applet = NULL;
 const char *extraopts = NULL;
@@ -124,7 +125,8 @@ extern char **environ;
 # define SYS_ioprio_set __NR_ioprio_set
 #endif
 #if !defined(__DragonFly__)
-static inline int ioprio_set(int which, int who, int ioprio)
+static inline int ioprio_set(int which _unused, int who _unused,
+			     int ioprio _unused)
 {
 #ifdef SYS_ioprio_set
 	return syscall(SYS_ioprio_set, which, who, ioprio);