SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-daemon: move _sd_hidden_ from .h to .c file

Browse Source
This commit is contained in:
Kay Sievers
2011-05-20 14:30:42 +02:00
parent b90865ba15
commit b136daf5ca
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sd-daemon.c
+16 -10
View File
@@ -49,7 +49,13 @@
#include "sd-daemon.h"
int sd_listen_fds(int unset_environment) {
#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS)
#define _sd_hidden_ __attribute__ ((visibility("hidden")))
#else
#define _sd_hidden_
#endif
_sd_hidden_ int sd_listen_fds(int unset_environment) {
#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
return 0;
@@ -130,7 +136,7 @@ finish:
#endif
}
int sd_is_fifo(int fd, const char *path) {
_sd_hidden_ int sd_is_fifo(int fd, const char *path) {
struct stat st_fd;
if (fd < 0)
@@ -163,7 +169,7 @@ int sd_is_fifo(int fd, const char *path) {
return 1;
}
static int sd_is_socket_internal(int fd, int type, int listening) {
_sd_hidden_ static int sd_is_socket_internal(int fd, int type, int listening) {
struct stat st_fd;
if (fd < 0 || type < 0)
@@ -214,7 +220,7 @@ union sockaddr_union {
struct sockaddr_storage storage;
};
int sd_is_socket(int fd, int family, int type, int listening) {
_sd_hidden_ int sd_is_socket(int fd, int family, int type, int listening) {
int r;
if (family < 0)
@@ -242,7 +248,7 @@ int sd_is_socket(int fd, int family, int type, int listening) {
return 1;
}
int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) {
_sd_hidden_ int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) {
union sockaddr_union sockaddr;
socklen_t l;
int r;
@@ -287,7 +293,7 @@ int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port
return 1;
}
int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) {
_sd_hidden_ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) {
union sockaddr_union sockaddr;
socklen_t l;
int r;
@@ -330,7 +336,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
return 1;
}
int sd_is_mq(int fd, const char *path) {
_sd_hidden_ int sd_is_mq(int fd, const char *path) {
#if !defined(__linux__)
return 0;
#else
@@ -367,7 +373,7 @@ int sd_is_mq(int fd, const char *path) {
#endif
}
int sd_notify(int unset_environment, const char *state) {
_sd_hidden_ int sd_notify(int unset_environment, const char *state) {
#if defined(DISABLE_SYSTEMD) || !defined(__linux__) || !defined(SOCK_CLOEXEC)
return 0;
#else
@@ -435,7 +441,7 @@ finish:
#endif
}
int sd_notifyf(int unset_environment, const char *format, ...) {
_sd_hidden_ int sd_notifyf(int unset_environment, const char *format, ...) {
#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
return 0;
#else
@@ -457,7 +463,7 @@ int sd_notifyf(int unset_environment, const char *format, ...) {
#endif
}
int sd_booted(void) {
_sd_hidden_ int sd_booted(void) {
#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
return 0;
#else
src/sd-daemon.h
+9 -17
View File
@@ -75,14 +75,6 @@ extern "C" {
#endif
#endif
#ifndef _sd_hidden_
#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS)
#define _sd_hidden_ __attribute__ ((visibility("hidden")))
#else
#define _sd_hidden_
#endif
#endif
/*
Log levels for usage on stderr:
@@ -117,7 +109,7 @@ extern "C" {
See sd_listen_fds(3) for more information.
*/
int sd_listen_fds(int unset_environment) _sd_hidden_;
int sd_listen_fds(int unset_environment);
/*
Helper call for identifying a passed file descriptor. Returns 1 if
@@ -129,7 +121,7 @@ int sd_listen_fds(int unset_environment) _sd_hidden_;
See sd_is_fifo(3) for more information.
*/
int sd_is_fifo(int fd, const char *path) _sd_hidden_;
int sd_is_fifo(int fd, const char *path);
/*
Helper call for identifying a passed file descriptor. Returns 1 if
@@ -145,7 +137,7 @@ int sd_is_fifo(int fd, const char *path) _sd_hidden_;
See sd_is_socket(3) for more information.
*/
int sd_is_socket(int fd, int family, int type, int listening) _sd_hidden_;
int sd_is_socket(int fd, int family, int type, int listening);
/*
Helper call for identifying a passed file descriptor. Returns 1 if
@@ -159,7 +151,7 @@ int sd_is_socket(int fd, int family, int type, int listening) _sd_hidden_;
See sd_is_socket_inet(3) for more information.
*/
int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) _sd_hidden_;
int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port);
/*
Helper call for identifying a passed file descriptor. Returns 1 if
@@ -175,7 +167,7 @@ int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port
See sd_is_socket_unix(3) for more information.
*/
int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) _sd_hidden_;
int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length);
/*
Helper call for identifying a passed file descriptor. Returns 1 if
@@ -183,7 +175,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
0 otherwise. If path is NULL a message queue name check is not
done. Returns a negative errno style error code on failure.
*/
int sd_is_mq(int fd, const char *path) _sd_hidden_;
int sd_is_mq(int fd, const char *path);
/*
Informs systemd about changed daemon state. This takes a number of
@@ -229,7 +221,7 @@ int sd_is_mq(int fd, const char *path) _sd_hidden_;
See sd_notify(3) for more information.
*/
int sd_notify(int unset_environment, const char *state) _sd_hidden_;
int sd_notify(int unset_environment, const char *state);
/*
Similar to sd_notify() but takes a format string.
@@ -251,7 +243,7 @@ int sd_notify(int unset_environment, const char *state) _sd_hidden_;
See sd_notifyf(3) for more information.
*/
int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(2,3) _sd_hidden_;
int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(2,3);
/*
Returns > 0 if the system was booted with systemd. Returns < 0 on
@@ -264,7 +256,7 @@ int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(
See sd_booted(3) for more information.
*/
int sd_booted(void) _sd_hidden_;
int sd_booted(void);
#ifdef __cplusplus
}