chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel-install: avoid using 'cp --preserve'
[elogind.git]
/
src
/
libsystemd-daemon
/
sd-daemon.c
diff --git
a/src/libsystemd-daemon/sd-daemon.c
b/src/libsystemd-daemon/sd-daemon.c
index 9cc1c37b468ce6e8ee84a110c419dc49768fb7b2..485b301023f3a7d36e388c282a4816e18c2f9499 100644
(file)
--- a/
src/libsystemd-daemon/sd-daemon.c
+++ b/
src/libsystemd-daemon/sd-daemon.c
@@
-32,11
+32,7
@@
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/un.h>
-#ifdef __BIONIC__
-# include <linux/fcntl.h>
-#else
-# include <sys/fcntl.h>
-#endif
+#include <fcntl.h>
#include <netinet/in.h>
#include <stdlib.h>
#include <errno.h>
#include <netinet/in.h>
#include <stdlib.h>
#include <errno.h>
@@
-278,11
+274,8
@@
_sd_export_ int sd_is_socket(int fd, int family, int type, int listening) {
return r;
if (family > 0) {
return r;
if (family > 0) {
- union sockaddr_union sockaddr;
- socklen_t l;
-
- memset(&sockaddr, 0, sizeof(sockaddr));
- l = sizeof(sockaddr);
+ union sockaddr_union sockaddr = {};
+ socklen_t l = sizeof(sockaddr);
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
@@
-297,8
+290,8
@@
_sd_export_ int sd_is_socket(int fd, int family, int type, int listening) {
}
_sd_export_ int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) {
}
_sd_export_ int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) {
- union sockaddr_union sockaddr;
- socklen_t l;
+ union sockaddr_union sockaddr
= {}
;
+ socklen_t l
= sizeof(sockaddr)
;
int r;
if (family != 0 && family != AF_INET && family != AF_INET6)
int r;
if (family != 0 && family != AF_INET && family != AF_INET6)
@@
-308,9
+301,6
@@
_sd_export_ int sd_is_socket_inet(int fd, int family, int type, int listening, u
if (r <= 0)
return r;
if (r <= 0)
return r;
- memset(&sockaddr, 0, sizeof(sockaddr));
- l = sizeof(sockaddr);
-
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
@@
-343,17
+333,14
@@
_sd_export_ int sd_is_socket_inet(int fd, int family, int type, int listening, u
}
_sd_export_ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) {
}
_sd_export_ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) {
- union sockaddr_union sockaddr;
- socklen_t l;
+ union sockaddr_union sockaddr
= {}
;
+ socklen_t l
= sizeof(sockaddr)
;
int r;
r = sd_is_socket_internal(fd, type, listening);
if (r <= 0)
return r;
int r;
r = sd_is_socket_internal(fd, type, listening);
if (r <= 0)
return r;
- memset(&sockaddr, 0, sizeof(sockaddr));
- l = sizeof(sockaddr);
-
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;