X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin.c;h=b8cdc708bc2e63306a2b8ce6b3d48e0bfff0e4d7;hp=b6b3ddc01918cba21af1da34e3984c15ce8f5e2c;hb=33502ffe2eb7b56cdd018a4fb6830d7828519fad;hpb=baa30fbc2c04b23209d0b8fb3c86cd15ef9ea81a

diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index b6b3ddc01..b8cdc708b 100644
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -34,6 +34,9 @@ static const struct udev_builtin *builtins[] = {
         [UDEV_BUILTIN_PCI_DB] = &udev_builtin_pci_db,
         [UDEV_BUILTIN_USB_DB] = &udev_builtin_usb_db,
         [UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id,
+#ifdef HAVE_ACL
+        [UDEV_BUILTIN_UACCESS] = &udev_builtin_uaccess,
+#endif
 };
 
 int udev_builtin_init(struct udev *udev)
@@ -41,7 +44,7 @@ int udev_builtin_init(struct udev *udev)
         unsigned int i;
         int err;
 
-        for (i = 0; i < ARRAY_SIZE(builtins); i++) {
+        for (i = 0; i < ELEMENTSOF(builtins); i++) {
                 if (builtins[i]->init) {
                         err = builtins[i]->init(udev);
                         if (err < 0)
@@ -55,7 +58,7 @@ void udev_builtin_exit(struct udev *udev)
 {
         unsigned int i;
 
-        for (i = 0; i < ARRAY_SIZE(builtins); i++)
+        for (i = 0; i < ELEMENTSOF(builtins); i++)
                 if (builtins[i]->exit)
                         builtins[i]->exit(udev);
 }
@@ -65,7 +68,7 @@ bool udev_builtin_validate(struct udev *udev)
         unsigned int i;
         bool change = false;
 
-        for (i = 0; i < ARRAY_SIZE(builtins); i++)
+        for (i = 0; i < ELEMENTSOF(builtins); i++)
                 if (builtins[i]->validate)
                         if (builtins[i]->validate(udev))
                                 change = true;
@@ -76,7 +79,7 @@ void udev_builtin_list(struct udev *udev)
 {
         unsigned int i;
 
-        for (i = 0; i < ARRAY_SIZE(builtins); i++)
+        for (i = 0; i < ELEMENTSOF(builtins); i++)
                 fprintf(stderr, "  %-12s %s\n", builtins[i]->name, builtins[i]->help);
 }
 
@@ -100,7 +103,7 @@ enum udev_builtin_cmd udev_builtin_lookup(const char *command)
         pos = strchr(name, ' ');
         if (pos)
                 pos[0] = '\0';
-        for (i = 0; i < ARRAY_SIZE(builtins); i++)
+        for (i = 0; i < ELEMENTSOF(builtins); i++)
                 if (strcmp(builtins[i]->name, name) == 0)
                         return i;
         return UDEV_BUILTIN_MAX;