chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fix SetUnitProperties
[elogind.git]
/
src
/
libudev
/
libudev-monitor.c
diff --git
a/src/libudev/libudev-monitor.c
b/src/libudev/libudev-monitor.c
index b02ea8808cf949a41de9caca803dba7e7b859f01..56a6c5e39a6c1cdfed19a37c7e33fadec3859de9 100644
(file)
--- a/
src/libudev/libudev-monitor.c
+++ b/
src/libudev/libudev-monitor.c
@@
-115,9
+115,9
@@
struct udev_monitor *udev_monitor_new_from_netlink_fd(struct udev *udev, const c
if (name == NULL)
group = UDEV_MONITOR_NONE;
if (name == NULL)
group = UDEV_MONITOR_NONE;
- else if (str
cmp(name, "udev") == 0
)
+ else if (str
eq(name, "udev")
)
group = UDEV_MONITOR_UDEV;
group = UDEV_MONITOR_UDEV;
- else if (str
cmp(name, "kernel") == 0
)
+ else if (str
eq(name, "kernel")
)
group = UDEV_MONITOR_KERNEL;
else
return NULL;
group = UDEV_MONITOR_KERNEL;
else
return NULL;
@@
-288,7
+288,7
@@
_public_ int udev_monitor_filter_update(struct udev_monitor *udev_monitor)
bpf_stmt(ins, &i, BPF_RET|BPF_K, 0xffffffff);
if (i+1 >= ELEMENTSOF(ins))
bpf_stmt(ins, &i, BPF_RET|BPF_K, 0xffffffff);
if (i+1 >= ELEMENTSOF(ins))
- return -
1
;
+ return -
E2BIG
;
}
/* nothing matched, drop packet */
}
/* nothing matched, drop packet */
@@
-303,7
+303,7
@@
_public_ int udev_monitor_filter_update(struct udev_monitor *udev_monitor)
filter.len = i;
filter.filter = ins;
err = setsockopt(udev_monitor->sock, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter));
filter.len = i;
filter.filter = ins;
err = setsockopt(udev_monitor->sock, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter));
- return err;
+ return err
< 0 ? -errno : 0
;
}
int udev_monitor_allow_unicast_sender(struct udev_monitor *udev_monitor, struct udev_monitor *sender)
}
int udev_monitor_allow_unicast_sender(struct udev_monitor *udev_monitor, struct udev_monitor *sender)
@@
-350,7
+350,7
@@
_public_ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
udev_monitor->snl.nl.nl_pid = snl.nl.nl_pid;
} else {
udev_err(udev_monitor->udev, "bind failed: %m\n");
udev_monitor->snl.nl.nl_pid = snl.nl.nl_pid;
} else {
udev_err(udev_monitor->udev, "bind failed: %m\n");
- return
err
;
+ return
-errno
;
}
/* enable receiving of sender credentials */
}
/* enable receiving of sender credentials */
@@
-371,7
+371,7
@@
_public_ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
_public_ int udev_monitor_set_receive_buffer_size(struct udev_monitor *udev_monitor, int size)
{
if (udev_monitor == NULL)
_public_ int udev_monitor_set_receive_buffer_size(struct udev_monitor *udev_monitor, int size)
{
if (udev_monitor == NULL)
- return -
1
;
+ return -
EINVAL
;
return setsockopt(udev_monitor->sock, SOL_SOCKET, SO_RCVBUFFORCE, &size, sizeof(size));
}
return setsockopt(udev_monitor->sock, SOL_SOCKET, SO_RCVBUFFORCE, &size, sizeof(size));
}
@@
-381,7
+381,7
@@
int udev_monitor_disconnect(struct udev_monitor *udev_monitor)
err = close(udev_monitor->sock);
udev_monitor->sock = -1;
err = close(udev_monitor->sock);
udev_monitor->sock = -1;
- return err;
+ return err
< 0 ? -errno : 0
;
}
/**
}
/**
@@
-408,7
+408,7
@@
_public_ struct udev_monitor *udev_monitor_ref(struct udev_monitor *udev_monitor
* the bound socket will be closed, and the resources of the monitor
* will be released.
*
* the bound socket will be closed, and the resources of the monitor
* will be released.
*
- * Returns:
the passed udev monitor if it has still an active reference, or #NULL otherwise.
+ * Returns:
#NULL
**/
_public_ struct udev_monitor *udev_monitor_unref(struct udev_monitor *udev_monitor)
{
**/
_public_ struct udev_monitor *udev_monitor_unref(struct udev_monitor *udev_monitor)
{
@@
-416,7
+416,7
@@
_public_ struct udev_monitor *udev_monitor_unref(struct udev_monitor *udev_monit
return NULL;
udev_monitor->refcount--;
if (udev_monitor->refcount > 0)
return NULL;
udev_monitor->refcount--;
if (udev_monitor->refcount > 0)
- return
udev_monitor
;
+ return
NULL
;
if (udev_monitor->sock >= 0)
close(udev_monitor->sock);
udev_list_cleanup(&udev_monitor->filter_subsystem_list);
if (udev_monitor->sock >= 0)
close(udev_monitor->sock);
udev_list_cleanup(&udev_monitor->filter_subsystem_list);
@@
-451,7
+451,7
@@
_public_ struct udev *udev_monitor_get_udev(struct udev_monitor *udev_monitor)
_public_ int udev_monitor_get_fd(struct udev_monitor *udev_monitor)
{
if (udev_monitor == NULL)
_public_ int udev_monitor_get_fd(struct udev_monitor *udev_monitor)
{
if (udev_monitor == NULL)
- return -
1
;
+ return -
EINVAL
;
return udev_monitor->sock;
}
return udev_monitor->sock;
}
@@
-467,7
+467,7
@@
static int passes_filter(struct udev_monitor *udev_monitor, struct udev_device *
const char *devtype;
const char *ddevtype;
const char *devtype;
const char *ddevtype;
- if (
strcmp(dsubsys, subsys) != 0
)
+ if (
!streq(dsubsys, subsys)
)
continue;
devtype = udev_list_entry_get_value(list_entry);
continue;
devtype = udev_list_entry_get_value(list_entry);
@@
-476,7
+476,7
@@
static int passes_filter(struct udev_monitor *udev_monitor, struct udev_device *
ddevtype = udev_device_get_devtype(udev_device);
if (ddevtype == NULL)
continue;
ddevtype = udev_device_get_devtype(udev_device);
if (ddevtype == NULL)
continue;
- if (str
cmp(ddevtype, devtype) == 0
)
+ if (str
eq(ddevtype, devtype)
)
goto tag;
}
return 0;
goto tag;
}
return 0;