Merge pull request #21786 from keszybz/dirent-work
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 16 Dec 2021 19:07:35 +0000 (04:07 +0900)
committerGitHub <noreply@github.com>
Thu, 16 Dec 2021 19:07:35 +0000 (04:07 +0900)
Make FOREACH_DIRENT and FOREACH_DIRENT_ALL declare the iterator variables

1  2 
meson.build
src/home/homed-manager.c
src/libsystemd/sd-device/sd-device.c
src/resolve/resolved-manager.c
src/udev/udevadm-info.c

diff --cc meson.build
Simple merge
Simple merge
index 8b6e1ddd699dab8ef9782db1e0f39b77e8b908e3,c348bd8f0f372253f19319af48e64d5c70330157..94ea61cc8dad46101cf61199dfe9edf19e74e4c9
@@@ -1812,10 -1811,10 +1811,10 @@@ static int device_sysattrs_read_all_int
                  if (lstat(path, &statbuf) != 0)
                          continue;
  
 -                if (!(statbuf.st_mode & S_IRUSR))
 +                if ((statbuf.st_mode & (S_IRUSR | S_IWUSR)) == 0)
                          continue;
  
-                 r = set_put_strdup(&device->sysattrs, p ?: dent->d_name);
+                 r = set_put_strdup(&device->sysattrs, p ?: de->d_name);
                  if (r < 0)
                          return r;
          }
Simple merge
Simple merge