chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timedated: replace systemd-timedated-ntp.target logic with simpler scheme
[elogind.git]
/
src
/
udev
/
udev-builtin.c
diff --git
a/src/udev/udev-builtin.c
b/src/udev/udev-builtin.c
index 508a22ecf8ca199bee1277dc5be60954d88ec7b8..6509f5881d4d513e4f1c696b99bb506c5b48ea48 100644
(file)
--- a/
src/udev/udev-builtin.c
+++ b/
src/udev/udev-builtin.c
@@
-42,9
+42,9
@@
static const struct udev_builtin *builtins[] = {
int udev_builtin_init(struct udev *udev)
{
unsigned int i;
int udev_builtin_init(struct udev *udev)
{
unsigned int i;
- int err;
+ int err
= 0
;
- 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)
if (builtins[i]->init) {
err = builtins[i]->init(udev);
if (err < 0)
@@
-58,7
+58,7
@@
void udev_builtin_exit(struct udev *udev)
{
unsigned int i;
{
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);
}
if (builtins[i]->exit)
builtins[i]->exit(udev);
}
@@
-68,7
+68,7
@@
bool udev_builtin_validate(struct udev *udev)
unsigned int i;
bool change = false;
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;
if (builtins[i]->validate)
if (builtins[i]->validate(udev))
change = true;
@@
-79,7
+79,7
@@
void udev_builtin_list(struct udev *udev)
{
unsigned int i;
{
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);
}
fprintf(stderr, " %-12s %s\n", builtins[i]->name, builtins[i]->help);
}
@@
-103,7
+103,7
@@
enum udev_builtin_cmd udev_builtin_lookup(const char *command)
pos = strchr(name, ' ');
if (pos)
pos[0] = '\0';
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;
if (strcmp(builtins[i]->name, name) == 0)
return i;
return UDEV_BUILTIN_MAX;