chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journalctl: use _COMM= match for scripts
[elogind.git]
/
src
/
shared
/
socket-util.c
diff --git
a/src/shared/socket-util.c
b/src/shared/socket-util.c
index 53457886e27ea58cf2d87fe2d12bcef0567e1c42..c583d3dfea3d8902262de499e646fcb08ad296d3 100644
(file)
--- a/
src/shared/socket-util.c
+++ b/
src/shared/socket-util.c
@@
-204,7
+204,7
@@
int socket_address_parse_netlink(SocketAddress *a, const char *s) {
errno = 0;
if (sscanf(s, "%ms %u", &sfamily, &group) < 1)
errno = 0;
if (sscanf(s, "%ms %u", &sfamily, &group) < 1)
- return errno ? -errno : -EINVAL;
+ return errno
> 0
? -errno : -EINVAL;
family = netlink_family_from_string(sfamily);
if (family < 0)
family = netlink_family_from_string(sfamily);
if (family < 0)
@@
-364,7
+364,7
@@
int socket_address_print(const SocketAddress *a, char **p) {
}
case AF_NETLINK: {
}
case AF_NETLINK: {
-
char _cleanup_free_
*sfamily = NULL;
+
_cleanup_free_ char
*sfamily = NULL;
r = netlink_family_to_string_alloc(a->protocol, &sfamily);
if (r < 0)
r = netlink_family_to_string_alloc(a->protocol, &sfamily);
if (r < 0)
@@
-568,7
+568,7
@@
bool socket_address_matches_fd(const SocketAddress *a, int fd) {
int make_socket_fd(const char* address, int flags) {
SocketAddress a;
int fd, r;
int make_socket_fd(const char* address, int flags) {
SocketAddress a;
int fd, r;
-
char _cleanup_free_
*p = NULL;
+
_cleanup_free_ char
*p = NULL;
r = socket_address_parse(&a, address);
if (r < 0) {
r = socket_address_parse(&a, address);
if (r < 0) {