chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: Add DropIn paths to status message
[elogind.git]
/
src
/
libudev
/
libudev-enumerate.c
diff --git
a/src/libudev/libudev-enumerate.c
b/src/libudev/libudev-enumerate.c
index 172965511b32cb6f366f9983d03449855d5c6f01..5ccaabdc6cdbed7062cd3bf4997533602118d520 100644
(file)
--- a/
src/libudev/libudev-enumerate.c
+++ b/
src/libudev/libudev-enumerate.c
@@
-81,6
+81,8
@@
_public_ struct udev_enumerate *udev_enumerate_new(struct udev *udev)
{
struct udev_enumerate *udev_enumerate;
{
struct udev_enumerate *udev_enumerate;
+ if (udev == NULL)
+ return NULL;
udev_enumerate = calloc(1, sizeof(struct udev_enumerate));
if (udev_enumerate == NULL)
return NULL;
udev_enumerate = calloc(1, sizeof(struct udev_enumerate));
if (udev_enumerate == NULL)
return NULL;
@@
-307,7
+309,7
@@
_public_ struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enume
}
if (move_later &&
}
if (move_later &&
-
strncmp(entry->syspath, move_later->syspath, move_later_prefix) != 0
) {
+
!strneq(entry->syspath, move_later->syspath, move_later_prefix)
) {
udev_list_entry_add(&udev_enumerate->devices_list, move_later->syspath, NULL);
move_later = NULL;
udev_list_entry_add(&udev_enumerate->devices_list, move_later->syspath, NULL);
move_later = NULL;
@@
-657,11
+659,11
@@
static int scan_dir_and_add_devices(struct udev_enumerate *udev_enumerate,
struct dirent *dent;
s = path;
struct dirent *dent;
s = path;
- l =
util_
strpcpyl(&s, sizeof(path), "/sys/", basedir, NULL);
+ l = strpcpyl(&s, sizeof(path), "/sys/", basedir, NULL);
if (subdir1 != NULL)
if (subdir1 != NULL)
- l =
util_
strpcpyl(&s, l, "/", subdir1, NULL);
+ l = strpcpyl(&s, l, "/", subdir1, NULL);
if (subdir2 != NULL)
if (subdir2 != NULL)
-
util_
strpcpyl(&s, l, "/", subdir2, NULL);
+ strpcpyl(&s, l, "/", subdir2, NULL);
dir = opendir(path);
if (dir == NULL)
return -ENOENT;
dir = opendir(path);
if (dir == NULL)
return -ENOENT;
@@
-675,7
+677,7
@@
static int scan_dir_and_add_devices(struct udev_enumerate *udev_enumerate,
if (!match_sysname(udev_enumerate, dent->d_name))
continue;
if (!match_sysname(udev_enumerate, dent->d_name))
continue;
-
util_
strscpyl(syspath, sizeof(syspath), path, "/", dent->d_name, NULL);
+ strscpyl(syspath, sizeof(syspath), path, "/", dent->d_name, NULL);
dev = udev_device_new_from_syspath(udev_enumerate->udev, syspath);
if (dev == NULL)
continue;
dev = udev_device_new_from_syspath(udev_enumerate->udev, syspath);
if (dev == NULL)
continue;
@@
-736,7
+738,7
@@
static int scan_dir(struct udev_enumerate *udev_enumerate, const char *basedir,
DIR *dir;
struct dirent *dent;
DIR *dir;
struct dirent *dent;
-
util_
strscpyl(path, sizeof(path), "/sys/", basedir, NULL);
+ strscpyl(path, sizeof(path), "/sys/", basedir, NULL);
dir = opendir(path);
if (dir == NULL)
return -1;
dir = opendir(path);
if (dir == NULL)
return -1;
@@
-787,7
+789,7
@@
static int scan_devices_tags(struct udev_enumerate *udev_enumerate)
struct dirent *dent;
char path[UTIL_PATH_SIZE];
struct dirent *dent;
char path[UTIL_PATH_SIZE];
-
util_
strscpyl(path, sizeof(path), "/run/udev/tags/", udev_list_entry_get_name(list_entry), NULL);
+ strscpyl(path, sizeof(path), "/run/udev/tags/", udev_list_entry_get_name(list_entry), NULL);
dir = opendir(path);
if (dir == NULL)
continue;
dir = opendir(path);
if (dir == NULL)
continue;