chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: use _cleanup_
[elogind.git]
/
src
/
udev
/
udev-event.c
diff --git
a/src/udev/udev-event.c
b/src/udev/udev-event.c
index ef9fc61c641fea622daced336540ff70e185a72a..efd9b6d71d84fdaff64887f5d8f975bd71ef5008 100644
(file)
--- a/
src/udev/udev-event.c
+++ b/
src/udev/udev-event.c
@@
-784,7
+784,7
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
if (udev_device_get_subsystem(dev) == NULL)
return -1;
if (udev_device_get_subsystem(dev) == NULL)
return -1;
- if (str
cmp(udev_device_get_action(dev), "remove") == 0
) {
+ if (str
eq(udev_device_get_action(dev), "remove")
) {
udev_device_read_db(dev, NULL);
udev_device_delete_db(dev);
udev_device_tag_index(dev, NULL, false);
udev_device_read_db(dev, NULL);
udev_device_delete_db(dev);
udev_device_tag_index(dev, NULL, false);
@@
-812,8
+812,8
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
udev_rules_apply_to_event(rules, event, sigmask);
/* rename a new network interface, if needed */
udev_rules_apply_to_event(rules, event, sigmask);
/* rename a new network interface, if needed */
- if (udev_device_get_ifindex(dev) > 0 && str
cmp(udev_device_get_action(dev), "add") == 0
&&
- event->name != NULL &&
strcmp(event->name, udev_device_get_sysname(dev)) != 0
) {
+ if (udev_device_get_ifindex(dev) > 0 && str
eq(udev_device_get_action(dev), "add")
&&
+ event->name != NULL &&
!streq(event->name, udev_device_get_sysname(dev))
) {
char syspath[UTIL_PATH_SIZE];
char *pos;
char syspath[UTIL_PATH_SIZE];
char *pos;