boot-splash: Clean up indenting and function order

Display normal, password, quastion should be together

diff --git a/src/libply-splash-core/ply-boot-splash.c b/src/libply-splash-core/ply-boot-splash.c
index 3ebee98472a78f2911dd455e4f4077d1225e3009..819e0baab79fb38d32186d3bee78fb6dadef3410 100644 (file)
--- a/src/libply-splash-core/ply-boot-splash.c
+++ b/src/libply-splash-core/ply-boot-splash.c
@@ -635,23 +635,25 @@ ply_boot_splash_hide (ply_boot_splash_t *splash)
     }
 }
 
-void ply_boot_splash_display_normal  (ply_boot_splash_t              *splash)
+void ply_boot_splash_display_message (ply_boot_splash_t             *splash,
+                                      const char                    *message)
 {
   assert (splash != NULL);
   assert (splash->plugin_interface != NULL);
   assert (splash->plugin != NULL);
-  if (splash->plugin_interface->display_normal != NULL)
-      splash->plugin_interface->display_normal (splash->plugin);
+  if (splash->plugin_interface->display_message != NULL)
+    splash->plugin_interface->display_message (splash->plugin, message);
 }
-void ply_boot_splash_display_message (ply_boot_splash_t             *splash,
-                                      const char                    *message)
+
+void ply_boot_splash_display_normal  (ply_boot_splash_t              *splash)
 {
   assert (splash != NULL);
   assert (splash->plugin_interface != NULL);
   assert (splash->plugin != NULL);
-  if (splash->plugin_interface->display_message != NULL)
-    splash->plugin_interface->display_message (splash->plugin, message);
+  if (splash->plugin_interface->display_normal != NULL)
+    splash->plugin_interface->display_normal (splash->plugin);
 }
+
 void ply_boot_splash_display_password (ply_boot_splash_t             *splash,
                                        const char                    *prompt,
                                        int                            bullets)
@@ -660,8 +662,9 @@ void ply_boot_splash_display_password (ply_boot_splash_t             *splash,
   assert (splash->plugin_interface != NULL);
   assert (splash->plugin != NULL);
   if (splash->plugin_interface->display_password != NULL)
-      splash->plugin_interface->display_password (splash->plugin, prompt, bullets);
+    splash->plugin_interface->display_password (splash->plugin, prompt, bullets);
 }
+
 void ply_boot_splash_display_question (ply_boot_splash_t             *splash,
                                        const char                    *prompt,
                                        const char                    *entry_text)
@@ -670,7 +673,7 @@ void ply_boot_splash_display_question (ply_boot_splash_t             *splash,
   assert (splash->plugin_interface != NULL);
   assert (splash->plugin != NULL);
   if (splash->plugin_interface->display_question != NULL)
-      splash->plugin_interface->display_question (splash->plugin, prompt, entry_text);
+    splash->plugin_interface->display_question (splash->plugin, prompt, entry_text);
 }
 
 

diff --git a/src/libply-splash-core/ply-boot-splash.h b/src/libply-splash-core/ply-boot-splash.h
index cc02bfe23fd92c250776c7f70beb4484f11ecd58..7865f002f39dbf5c6eb59479945d2d8e426108c8 100644 (file)
--- a/src/libply-splash-core/ply-boot-splash.h
+++ b/src/libply-splash-core/ply-boot-splash.h
@@ -69,10 +69,10 @@ void ply_boot_splash_update_output (ply_boot_splash_t *splash,
                                     const char        *output,
                                     size_t             size);
 void ply_boot_splash_root_mounted (ply_boot_splash_t *splash);
-void ply_boot_splash_hide (ply_boot_splash_t *splash);
-void ply_boot_splash_display_normal  (ply_boot_splash_t *splash);
 void ply_boot_splash_display_message (ply_boot_splash_t *splash,
                                       const char        *message);
+void ply_boot_splash_hide (ply_boot_splash_t *splash);
+void ply_boot_splash_display_normal  (ply_boot_splash_t *splash);
 void ply_boot_splash_display_password (ply_boot_splash_t *splash,
                                        const char        *prompt,
                                        int                bullets);