summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/bootsplash.c
diff options
context:
space:
mode:
authorNicolas Lécureuil <neoclust@mageia.org>2012-11-11 11:44:08 +0000
committerNicolas Lécureuil <neoclust@mageia.org>2012-11-11 11:44:08 +0000
commit78f8c70e3799aad37359ca6b399195e95a94d07c (patch)
tree90022f297c6d47255b425c79fd323c156f4ebdb5 /mdk-stage1/bootsplash.c
parent820fd62a86a88b3c53d5ebe1939e4dc51cc8bcdc (diff)
downloaddrakx-backup-do-not-use-78f8c70e3799aad37359ca6b399195e95a94d07c.tar
drakx-backup-do-not-use-78f8c70e3799aad37359ca6b399195e95a94d07c.tar.gz
drakx-backup-do-not-use-78f8c70e3799aad37359ca6b399195e95a94d07c.tar.bz2
drakx-backup-do-not-use-78f8c70e3799aad37359ca6b399195e95a94d07c.tar.xz
drakx-backup-do-not-use-78f8c70e3799aad37359ca6b399195e95a94d07c.zip
Revert commit 6430
Diffstat (limited to 'mdk-stage1/bootsplash.c')
-rw-r--r--mdk-stage1/bootsplash.c51
1 files changed, 23 insertions, 28 deletions
diff --git a/mdk-stage1/bootsplash.c b/mdk-stage1/bootsplash.c
index 839b4562e..9d0d53327 100644
--- a/mdk-stage1/bootsplash.c
+++ b/mdk-stage1/bootsplash.c
@@ -23,53 +23,48 @@ static FILE* splash = NULL;
static void update_progression_only(int current_size)
{
- if (splash && total_size) {
- float ratio = (float) (current_size + 1) / total_size;
- if (ratio > previous + 0.01) {
- fprintf(splash, "show %d\n", (int) (ratio * 65534));
- fflush(splash);
- previous = ratio;
- }
- }
+ if (splash && total_size) {
+ float ratio = (float) (current_size + 1) / total_size;
+ if (ratio > previous + 0.01) {
+ fprintf(splash, "show %d\n", (int) (ratio * 65534));
+ fflush(splash);
+ previous = ratio;
+ }
+ }
}
static void open_bootsplash(void)
{
- if (!splash) {
- splash = fopen("/proc/splash", "w");
- }
-
- if (!splash) {
- log_message("opening /proc/splash failed");
- }
+ if (!splash) splash = fopen("/proc/splash", "w");
+ if (!splash) log_message("opening /proc/splash failed");
}
void exit_bootsplash(void)
{
- log_message("exiting bootsplash");
- open_bootsplash();
- if (splash) {
- fprintf(splash, "verbose\n");
- fflush(splash);
- }
+ log_message("exiting bootsplash");
+ open_bootsplash();
+ if (splash) {
+ fprintf(splash, "verbose\n");
+ fflush(splash);
+ }
}
void init_progression(char *msg, int size)
{
- previous = 0; total_size = size;
- open_bootsplash();
- update_progression_only(0);
- init_progression_raw(msg, size);
+ previous = 0; total_size = size;
+ open_bootsplash();
+ update_progression_only(0);
+ init_progression_raw(msg, size);
}
void update_progression(int current_size)
{
- update_progression_only(current_size);
- update_progression_raw(current_size);
+ update_progression_only(current_size);
+ update_progression_raw(current_size);
}
void end_progression(void)
{
- end_progression_raw();
+ end_progression_raw();
}