allow multiple values to be matched with KEY=="value1|value2"

[elogind.git] / libsysfs / sysfs_dir.c

diff --git a/libsysfs/sysfs_dir.c b/libsysfs/sysfs_dir.c
index 63eec7bb9ac06aa0e042d2a2cc530da636cfb294..7d98c669c65d575e06bf5f4105950626c93016b0 100644 (file)
--- a/libsysfs/sysfs_dir.c
+++ b/libsysfs/sysfs_dir.c
@@ -244,7 +244,7 @@ int sysfs_write_attribute(struct sysfs_attribute *sysattr,
                close(fd);
                return -1;
        } else if ((unsigned int)length != len) {
-               dprintf("Could not write %d bytes to attribute %s\n", 
+               dprintf("Could not write %zd bytes to attribute %s\n", 
                                        len, sysattr->name);
                /* 
                 * since we could not write user supplied number of bytes,
@@ -338,7 +338,7 @@ struct sysfs_attribute *get_attribute(void *dev, const char *name)
                        SYSFS_PATH_MAX);
        safestrcatmax(path, "/", SYSFS_PATH_MAX);
        safestrcatmax(path, name, SYSFS_PATH_MAX);
-       if (!(sysfs_path_is_file(path)))
+       if (!sysfs_path_is_file(path))
                cur = add_attribute((void *)dev, path);
        return cur;
 }
@@ -373,7 +373,7 @@ struct dlist *read_dir_links(const char *path)
                safestrcpy(file_path, path);
                safestrcat(file_path, "/");
                safestrcat(file_path, dirent->d_name);
-               if ((sysfs_path_is_link(file_path)) == 0) {
+               if (!sysfs_path_is_link(file_path)) {
                        if (!linklist) {
                                linklist = dlist_new_with_delete
                                        (SYSFS_NAME_LEN, sysfs_del_name);
@@ -421,7 +421,7 @@ struct dlist *read_dir_subdirs(const char *path)
                safestrcpy(file_path, path);
                safestrcat(file_path, "/");
                safestrcat(file_path, dirent->d_name);
-               if ((sysfs_path_is_dir(file_path)) == 0) {
+               if (!sysfs_path_is_dir(file_path)) {
                        if (!dirlist) {
                                dirlist = dlist_new_with_delete
                                        (SYSFS_NAME_LEN, sysfs_del_name);
@@ -471,7 +471,7 @@ struct dlist *get_attributes_list(void *dev)
                safestrcpy(file_path, path);
                safestrcat(file_path, "/");
                safestrcat(file_path, dirent->d_name);
-               if ((sysfs_path_is_file(file_path)) == 0) {
+               if (!sysfs_path_is_file(file_path)) {
                        if (((struct sysfs_device *)dev)->attrlist) {
                                /* check if attr is already in the list */
                                attr = (struct sysfs_attribute *)