chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: replace ARRAY_SIZE() with ELEMENTSOF()
[elogind.git]
/
src
/
udev
/
udev-event.c
diff --git
a/src/udev/udev-event.c
b/src/udev/udev-event.c
index bea316c18e6817a10951452a9f49fca376bd4fe5..eab1bae27fdf2a9c8243b3de6f4a41635326eef1 100644
(file)
--- a/
src/udev/udev-event.c
+++ b/
src/udev/udev-event.c
@@
-132,7
+132,7
@@
size_t udev_event_apply_format(struct udev_event *event, const char *src, char *
goto copy;
}
goto copy;
}
- for (i = 0; i <
ARRAY_SIZE
(map); i++) {
+ for (i = 0; i <
ELEMENTSOF
(map); i++) {
if (strncmp(&from[1], map[i].name, strlen(map[i].name)) == 0) {
type = map[i].type;
from += strlen(map[i].name)+1;
if (strncmp(&from[1], map[i].name, strlen(map[i].name)) == 0) {
type = map[i].type;
from += strlen(map[i].name)+1;
@@
-148,7
+148,7
@@
size_t udev_event_apply_format(struct udev_event *event, const char *src, char *
goto copy;
}
goto copy;
}
- for (i = 0; i <
ARRAY_SIZE
(map); i++) {
+ for (i = 0; i <
ELEMENTSOF
(map); i++) {
if (from[1] == map[i].fmt) {
type = map[i].type;
from += 2;
if (from[1] == map[i].fmt) {
type = map[i].type;
from += 2;
@@
-486,7
+486,7
@@
static void spawn_read(struct udev_event *event,
timeout = -1;
}
timeout = -1;
}
- fdcount = epoll_wait(fd_ep, ev,
ARRAY_SIZE
(ev), timeout);
+ fdcount = epoll_wait(fd_ep, ev,
ELEMENTSOF
(ev), timeout);
if (fdcount < 0) {
if (errno == EINTR)
continue;
if (fdcount < 0) {
if (errno == EINTR)
continue;