various: inline some iterator variables

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-03-21 14:20:53 +01:00 committed by Yu Watanabe
parent 904447ce5a
commit 4053d11006
2 changed files with 6 additions and 12 deletions

View file

@ -152,7 +152,6 @@ struct udev_list_entry *udev_list_get_entry(struct udev_list *list) {
else {
_cleanup_free_ struct udev_list_entry **buf = NULL;
struct udev_list_entry *entry, **p;
size_t j;
buf = new(struct udev_list_entry *, n);
if (!buf)
@ -164,7 +163,7 @@ struct udev_list_entry *udev_list_get_entry(struct udev_list *list) {
typesafe_qsort(buf, n, udev_list_entry_compare_func);
for (j = n; j > 0; j--)
for (size_t j = n; j > 0; j--)
LIST_PREPEND(entries, list->entries, buf[j-1]);
}

View file

@ -321,24 +321,19 @@ int seat_switch_to_next(Seat *s) {
}
int seat_switch_to_previous(Seat *s) {
unsigned start, i;
Session *session;
if (MALLOC_ELEMENTSOF(s->positions) == 0)
return -EINVAL;
start = 1;
if (s->active && s->active->position > 0)
start = s->active->position;
size_t start = s->active && s->active->position > 0 ? s->active->position : 1;
for (i = start - 1; i > 0; --i) {
session = seat_get_position(s, i);
for (size_t i = start - 1; i > 0; i--) {
Session *session = seat_get_position(s, i);
if (session)
return session_activate(session);
}
for (i = MALLOC_ELEMENTSOF(s->positions) - 1; i > start; --i) {
session = seat_get_position(s, i);
for (size_t i = MALLOC_ELEMENTSOF(s->positions) - 1; i > start; i--) {
Session *session = seat_get_position(s, i);
if (session)
return session_activate(session);
}