Rearrange functions to drop forward declaration

diff --git a/src/main.c b/src/main.c
index f55d5863934c4c115034d1f322121d73b9d171b9..c92791b42f9fbe0bf4438afd32bdb9f7d8c8447e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -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)
 {