fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 03:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rearrange functions to drop forward declaration

Browse source
This commit is contained in:
Ray Strode 2008-07-11 08:46:15 -04:00
parent a68a8b736a
commit 254292def2
1 changed files with 32 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/main.c
View file

@ -65,8 +65,6 @@ static ply_boot_splash_t *start_boot_splash (state_t *state,
static ply_window_t *create_window (state_t *state, int vt_number);
static bool plymouth_should_show_default_splash (state_t *state);
static void
on_session_output (state_t *state,
const char *output,
@ -161,6 +159,38 @@ show_default_splash (state_t *state)
ply_error ("could not start boot splash: %m");
}
static bool
plymouth_should_show_default_splash (state_t *state)
{
ply_trace ("checking if plymouth should be running");
const char const *strings[] = {
" single ", " single", "^single ",
" 1 ", " 1", "^1 ",
" init=", "^init=",
NULL
};
int i;
for (i = 0; strings[i] != NULL; i++)
{
int cmp;
if (strings[i][0] == '^')
cmp = strncmp(state->kernel_command_line, strings[i]+1,
strlen(strings[i]+1)) == 0;
else
cmp = strstr (state->kernel_command_line, strings[i]) != NULL;
if (cmp)
{
ply_trace ("kernel command line has option \"%s\"", strings[i]);
return false;
}
}
return strstr (state->kernel_command_line, "rhgb") != NULL;
}
static void
on_show_splash (state_t *state)
{
@ -420,38 +450,6 @@ set_console_io_to_vt1 (state_t *state)
return true;
}
static bool
plymouth_should_show_default_splash (state_t *state)
{
ply_trace ("checking if plymouth should be running");
const char const *strings[] = {
" single ", " single", "^single ",
" 1 ", " 1", "^1 ",
" init=", "^init=",
NULL
};
int i;
for (i = 0; strings[i] != NULL; i++)
{
int cmp;
if (strings[i][0] == '^')
cmp = strncmp(state->kernel_command_line, strings[i]+1,
strlen(strings[i]+1)) == 0;
else
cmp = strstr (state->kernel_command_line, strings[i]) != NULL;
if (cmp)
{
ply_trace ("kernel command line has option \"%s\"", strings[i]);
return false;
}
}
return strstr (state->kernel_command_line, "rhgb") != NULL;
}
static bool
initialize_environment (state_t *state)
{