From 7b3cf97105e680c0292f67d49baf1b8abb855b62 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Tue, 5 Jun 2007 22:48:15 -0700 Subject: [PATCH] Stealth whitespace cleanup --- com32/include/syslinux/vesacon.h | 9 +++------ com32/lib/Makefile | 2 +- com32/lib/sys/vesa/background.c | 8 ++++---- com32/modules/menumain.c | 6 +++--- com32/modules/printmsg.c | 2 -- com32/modules/readconfig.c | 2 +- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/com32/include/syslinux/vesacon.h b/com32/include/syslinux/vesacon.h index fd25fa1..90ab99f 100644 --- a/com32/include/syslinux/vesacon.h +++ b/com32/include/syslinux/vesacon.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- * - * + * * Copyright 2007 H. Peter Anvin - All Rights Reserved * * Permission is hereby granted, free of charge, to any person @@ -10,10 +10,10 @@ * sell copies of the Software, and to permit persons to whom * the Software is furnished to do so, subject to the following * conditions: - * + * * The above copyright notice and this permission notice shall * be included in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -33,6 +33,3 @@ int vesacon_load_background(const char *); int vesacon_set_background(unsigned int); #endif /* _SYSLINUX_VESACON_H */ - - - diff --git a/com32/lib/Makefile b/com32/lib/Makefile index f2713aa..b759cd0 100644 --- a/com32/lib/Makefile +++ b/com32/lib/Makefile @@ -72,7 +72,7 @@ LIBOBJS = \ syslinux/shuffle_rm.o syslinux/zonelist.o \ syslinux/dump_mmap.o syslinux/dump_movelist.o \ \ - syslinux/run_default.o syslinux/run_command.o \ + syslinux/run_default.o syslinux/run_command.o \ syslinux/cleanup.o syslinux/localboot.o syslinux/runimage.o \ \ syslinux/loadfile.o \ diff --git a/com32/lib/sys/vesa/background.c b/com32/lib/sys/vesa/background.c index 0c5a057..cc515fb 100644 --- a/com32/lib/sys/vesa/background.c +++ b/com32/lib/sys/vesa/background.c @@ -283,10 +283,10 @@ int vesacon_load_background(const char *filename) if (!fp) goto err; - + if (fread(header, 1, 8, fp) != 8) goto err; - + if (!png_sig_cmp(header, 0, 8)) { rv = read_png_file(fp); } else if (!jpeg_sig_cmp(header, 8)) { @@ -295,11 +295,11 @@ int vesacon_load_background(const char *filename) /* This actually displays the stuff */ draw_background(); - + err: if (fp) fclose(fp); - + return rv; } diff --git a/com32/modules/menumain.c b/com32/modules/menumain.c index 4faaabd..2af4e8c 100644 --- a/com32/modules/menumain.c +++ b/com32/modules/menumain.c @@ -126,7 +126,7 @@ void set_msg_colors_global(unsigned int fg, unsigned int bg, /* Converting PC RGBI to sensible RGBA values is an "interesting" proposition. This algorithm may need plenty of tweaking. */ - + fga = fg & 0xff000000; fgh = ((fg >> 1) & 0xff000000) | 0x80000000; @@ -192,7 +192,7 @@ install_default_color_table(void) if (cp->ansi) free((void *)cp->ansi); - + asprintf((char **)&cp->ansi, "%s3%d;4%d", (i & 8) ? "1;" : "", pc2ansi[i & 7], pc2ansi[(i >> 4) & 7]); @@ -543,7 +543,7 @@ static void show_fkey(int key) case KEY_F12: fkey = 11; break; default: fkey = -1; break; } - + if (fkey == -1) break; diff --git a/com32/modules/printmsg.c b/com32/modules/printmsg.c index dbda84e..128bbc0 100644 --- a/com32/modules/printmsg.c +++ b/com32/modules/printmsg.c @@ -105,5 +105,3 @@ int show_message_file(const char *filename, const char *background) return rv; } - - diff --git a/com32/modules/readconfig.c b/com32/modules/readconfig.c index dc604df..1046bbc 100644 --- a/com32/modules/readconfig.c +++ b/com32/modules/readconfig.c @@ -568,7 +568,7 @@ static void parse_config_file(FILE *f) if (*p) { if (!looking_at(p, "*")) fg_mask = parse_argb(&p); - + p = skipspace(p); if (*p) { if (!looking_at(p, "*")) -- 2.7.4