From 4053d11006367d689ae4c9852de5ef5fc4125b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 21 Mar 2022 14:20:53 +0100 Subject: [PATCH] various: inline some iterator variables --- src/libudev/libudev-list.c | 3 +-- src/login/logind-seat.c | 15 +++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/libudev/libudev-list.c b/src/libudev/libudev-list.c index d3b63b1f8fb..0adc1d58e3d 100644 --- a/src/libudev/libudev-list.c +++ b/src/libudev/libudev-list.c @@ -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]); } diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c index 8e603f1f383..88ff4ce45ee 100644 --- a/src/login/logind-seat.c +++ b/src/login/logind-seat.c @@ -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); }