From c98908f6db5ef29a15a98b0dbc756dc24c8ef38a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 17 Sep 2008 12:06:14 +0200 Subject: [PATCH] screen: moved code to find_configured_screen() --- src/screen.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/screen.c b/src/screen.c index 797eae2..91b4c26 100644 --- a/src/screen.c +++ b/src/screen.c @@ -160,23 +160,26 @@ switch_screen_mode(gint id, mpdclient_t *c) mode_fn->open(screen, c); } +static int +find_configured_screen(const char *name) +{ + unsigned i; + + for (i = 0; options.screen_list[i] != NULL; ++i) + if (strcmp(options.screen_list[i], name) == 0) + return i; + + return -1; +} + static void screen_next_mode(mpdclient_t *c, int offset) { int max = g_strv_length(options.screen_list); int current, next; - int i; /* find current screen */ - current = -1; - i = 0; - while (options.screen_list[i]) { - if (strcmp(options.screen_list[i], - screens[screen->mode].name) == 0) - current = i; - i++; - } - + current = find_configured_screen(screens[screen->mode].name); next = current + offset; if (next<0) next = max-1; -- 2.30.2