chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: use startswith() and streq()
[elogind.git]
/
src
/
libudev
/
libudev-enumerate.c
diff --git
a/src/libudev/libudev-enumerate.c
b/src/libudev/libudev-enumerate.c
index ed4f62c66c4f9f825ca6242055d42cde467d949c..4725912c362add46dbe511f61c5afb69cb09f848 100644
(file)
--- a/
src/libudev/libudev-enumerate.c
+++ b/
src/libudev/libudev-enumerate.c
@@
-232,7
+232,7
@@
static size_t devices_delay_later(struct udev *udev, const char *syspath)
c += 11;
c += strcspn(c, "/");
c += 11;
c += strcspn(c, "/");
- if (st
rncmp(c, "/controlC", 9) == 0
)
+ if (st
artswith(c, "/controlC")
)
return c - syspath + 1;
}
return c - syspath + 1;
}
@@
-595,13
+595,10
@@
static bool match_tag(struct udev_enumerate *udev_enumerate, struct udev_device
static bool match_parent(struct udev_enumerate *udev_enumerate, struct udev_device *dev)
{
static bool match_parent(struct udev_enumerate *udev_enumerate, struct udev_device *dev)
{
- const char *parent;
-
if (udev_enumerate->parent_match == NULL)
return true;
if (udev_enumerate->parent_match == NULL)
return true;
- parent = udev_device_get_devpath(udev_enumerate->parent_match);
- return strncmp(parent, udev_device_get_devpath(dev), strlen(parent)) == 0;
+ return startswith(udev_device_get_devpath(dev), udev_device_get_devpath(udev_enumerate->parent_match));
}
static bool match_sysname(struct udev_enumerate *udev_enumerate, const char *sysname)
}
static bool match_sysname(struct udev_enumerate *udev_enumerate, const char *sysname)