chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f391000
)
libsystemd-daemon: fix style
author
Michal Schmidt
<mschmidt@redhat.com>
Tue, 30 Oct 2012 09:30:44 +0000
(10:30 +0100)
committer
Michal Schmidt
<mschmidt@redhat.com>
Tue, 30 Oct 2012 09:30:44 +0000
(10:30 +0100)
src/libsystemd-daemon/sd-daemon.c
patch
|
blob
|
history
diff --git
a/src/libsystemd-daemon/sd-daemon.c
b/src/libsystemd-daemon/sd-daemon.c
index 480db3bbb9dab9eb85a8497abe1a32d97c459afe..4801d2cd18ff31fffdeee9fc0ed1d6a1bf8164c0 100644
(file)
--- a/
src/libsystemd-daemon/sd-daemon.c
+++ b/
src/libsystemd-daemon/sd-daemon.c
@@
-75,7
+75,8
@@
_sd_export_ int sd_listen_fds(int unset_environment) {
char *p = NULL;
unsigned long l;
char *p = NULL;
unsigned long l;
- if (!(e = getenv("LISTEN_PID"))) {
+ e = getenv("LISTEN_PID");
+ if (!e) {
r = 0;
goto finish;
}
r = 0;
goto finish;
}
@@
-99,7
+100,8
@@
_sd_export_ int sd_listen_fds(int unset_environment) {
goto finish;
}
goto finish;
}
- if (!(e = getenv("LISTEN_FDS"))) {
+ e = getenv("LISTEN_FDS");
+ if (!e) {
r = 0;
goto finish;
}
r = 0;
goto finish;
}
@@
-120,7
+122,8
@@
_sd_export_ int sd_listen_fds(int unset_environment) {
for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) {
int flags;
for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) {
int flags;
- if ((flags = fcntl(fd, F_GETFD)) < 0) {
+ flags = fcntl(fd, F_GETFD);
+ if (flags < 0) {
r = -errno;
goto finish;
}
r = -errno;
goto finish;
}
@@
-270,7
+273,8
@@
_sd_export_ int sd_is_socket(int fd, int family, int type, int listening) {
if (family < 0)
return -EINVAL;
if (family < 0)
return -EINVAL;
- if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
+ r = sd_is_socket_internal(fd, type, listening);
+ if (r <= 0)
return r;
if (family > 0) {
return r;
if (family > 0) {
@@
-300,7
+304,8
@@
_sd_export_ int sd_is_socket_inet(int fd, int family, int type, int listening, u
if (family != 0 && family != AF_INET && family != AF_INET6)
return -EINVAL;
if (family != 0 && family != AF_INET && family != AF_INET6)
return -EINVAL;
- if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
+ r = sd_is_socket_internal(fd, type, listening);
+ if (r <= 0)
return r;
memset(&sockaddr, 0, sizeof(sockaddr));
return r;
memset(&sockaddr, 0, sizeof(sockaddr));
@@
-342,7
+347,8
@@
_sd_export_ int sd_is_socket_unix(int fd, int type, int listening, const char *p
socklen_t l;
int r;
socklen_t l;
int r;
- if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
+ r = sd_is_socket_internal(fd, type, listening);
+ if (r <= 0)
return r;
memset(&sockaddr, 0, sizeof(sockaddr));
return r;
memset(&sockaddr, 0, sizeof(sockaddr));
@@
-432,7
+438,8
@@
_sd_export_ int sd_notify(int unset_environment, const char *state) {
goto finish;
}
goto finish;
}
- if (!(e = getenv("NOTIFY_SOCKET")))
+ e = getenv("NOTIFY_SOCKET");
+ if (!e)
return 0;
/* Must be an abstract socket, or an absolute path */
return 0;
/* Must be an abstract socket, or an absolute path */
@@
-441,7
+448,8
@@
_sd_export_ int sd_notify(int unset_environment, const char *state) {
goto finish;
}
goto finish;
}
- if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) {
+ fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0);
+ if (fd < 0) {
r = -errno;
goto finish;
}
r = -errno;
goto finish;
}