Whitespace cleanup...syslinux-3.62-pre11

29 files changed, 62 insertions, 72 deletions

diff --git a/adv.inc b/adv.inc
index 02dd9c78..c5e8270c 100644
--- a/adv.inc
+++ b/adv.inc
@@ -1,5 +1,5 @@
 ;; -----------------------------------------------------------------------
-;;   
+;;
 ;;   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
 ;;
 ;;   This program is free software; you can redistribute it and/or modify
diff --git a/bcopy32.inc b/bcopy32.inc
index 99a16d88..fd14409f 100644
--- a/bcopy32.inc
+++ b/bcopy32.inc
@@ -144,7 +144,7 @@ simple_pm_call:
 		mov [cs:bcopy_gdt.SS16+2],eax
 
 		push ss			; Save real-mode SS selector
-	
+
 		o32 lgdt [cs:bcopy_gdt]
 		mov eax,cr0
 		or al,1
diff --git a/bin2c.pl b/bin2c.pl
index bd7452e9..5a60ca9e 100644
--- a/bin2c.pl
+++ b/bin2c.pl
@@ -61,7 +61,7 @@ if ($align != 0) {
 	    $pos = 0;
 	} elsif ( $pos > 0 ) {
 	    print ", ";
-	} else {	
+	} else {
 	    print "\t";
 	}
 	print '0x00';
diff --git a/com32/include/syslinux/advconst.h b/com32/include/syslinux/advconst.h
index 156a11b5..1e1ec73e 100644
--- a/com32/include/syslinux/advconst.h
+++ b/com32/include/syslinux/advconst.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 2007-2008 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
diff --git a/com32/lib/Makefile b/com32/lib/Makefile
index d8fb30d2..810c2bc5 100644
--- a/com32/lib/Makefile
+++ b/com32/lib/Makefile
@@ -85,7 +85,7 @@ LIBOBJS = \
 	\
 	syslinux/pxe_get_cached.o					\
 	\
-	syslinux/adv.o syslinux/advwrite.o syslinux/getadv.o 		\
+	syslinux/adv.o syslinux/advwrite.o syslinux/getadv.o		\
 	syslinux/setadv.o
 
 BINDIR   = /usr/bin
diff --git a/com32/lib/pci/scan.c b/com32/lib/pci/scan.c
index 0add9f9c..11869930 100644
--- a/com32/lib/pci/scan.c
+++ b/com32/lib/pci/scan.c
@@ -89,7 +89,7 @@ void get_module_name_from_pci_ids(struct pci_device_list *pci_device_list)
   /* adding a pci_dev_info member if needed*/
   for (pci_dev=0; pci_dev < pci_device_list->count; pci_dev++) {
     struct pci_device *pci_device = &(pci_device_list->pci_device[pci_dev]);
-    
+
     /* initialize the pci_dev_info structure if it doesn't exist yet. */
     if (! pci_device->pci_dev_info) {
       pci_device->pci_dev_info = calloc(1,sizeof (struct pci_device));
@@ -100,7 +100,7 @@ void get_module_name_from_pci_ids(struct pci_device_list *pci_device_list)
     }
     pci_device->pci_dev_info->linux_kernel_module=strdup("unknown");
   }
-  
+
   /* Opening the modules.pcimap (ofa linux kernel) from the boot device*/
   f=fopen("modules.pcimap","r");
   if (!f)
@@ -116,7 +116,7 @@ void get_module_name_from_pci_ids(struct pci_device_list *pci_device_list)
     /*skipping unecessary lines */
     if ((line[0] == '#') || (line[0] == ' ') || (line[0] == 10))
         continue;
-    
+
     char *result = NULL;
     int field=0;
 
@@ -143,7 +143,7 @@ void get_module_name_from_pci_ids(struct pci_device_list *pci_device_list)
     for (pci_dev=0; pci_dev < pci_device_list->count; pci_dev++) {
       struct pci_device *pci_device =
 	&pci_device_list->pci_device[pci_dev];
-      
+
       if (hex_to_int(vendor_id) == pci_device->vendor &&
 	  hex_to_int(product_id) == pci_device->product &&
 	  (hex_to_int(sub_product_id) & pci_device->sub_product)
@@ -185,7 +185,7 @@ void get_name_from_pci_ids(struct pci_device_list *pci_device_list)
 	return;
       }
     }
-    
+
     pci_device->pci_dev_info->vendor_name=strdup("unknown");
     pci_device->pci_dev_info->product_name=strdup("unknown");
   }
@@ -261,25 +261,25 @@ void get_name_from_pci_ids(struct pci_device_list *pci_device_list)
 
     /* if we have two tabs, it means this is a sub product */
     } else if ((line[0] == '\t') && (line[1] == '\t')) {
-      
+
       /* the product name is last field */
       product=skipspace(strstr(line," "));
       product=strdup(skipspace(strstr(product," ")));
       remove_eol(product);
-      
+
       /* the sub_vendor id is first field */
       strncpy(sub_vendor_id,&line[2],4);
       sub_vendor_id[4]=0;
-      
+
       /* the sub_vendor id is second field */
       strncpy(sub_product_id,&line[7],4);
       sub_product_id[4]=0;
-      
+
       /* assign the product_name to any matching pci device*/
       for (pci_dev=0; pci_dev < pci_device_list->count; pci_dev++) {
 	struct pci_device *pci_device =
 	  &pci_device_list->pci_device[pci_dev];
-	
+
 	if (hex_to_int(vendor_id) == pci_device->vendor &&
 	    hex_to_int(product_id) == pci_device->product &&
 	    hex_to_int(sub_product_id) == pci_device->sub_product &&
diff --git a/com32/lib/sys/entry.S b/com32/lib/sys/entry.S
index 0e3a80be..5834d5d5 100644
--- a/com32/lib/sys/entry.S
+++ b/com32/lib/sys/entry.S
@@ -29,7 +29,7 @@
 
 /* Number of arguments in our version of the entry structure */
 #define COM32_ARGS 6
-	
+
 		.section ".init","ax"
 		.globl _start
 		.type _start, @function
diff --git a/com32/lib/sys/vesa/background.c b/com32/lib/sys/vesa/background.c
index 941d155d..3bdda208 100644
--- a/com32/lib/sys/vesa/background.c
+++ b/com32/lib/sys/vesa/background.c
@@ -54,7 +54,7 @@ static void draw_background_line(int line, int start, int npixels)
   uint32_t *bgptr = &__vesacon_background[line][start];
   unsigned int bytes_per_pixel = __vesacon_bytes_per_pixel;
   size_t fbptr = line*__vesa_info.mi.logical_scan + start*bytes_per_pixel;
-  
+
   __vesacon_copy_to_screen(fbptr, bgptr, npixels);
 }
 
diff --git a/com32/lib/sys/vesa/initvesa.c b/com32/lib/sys/vesa/initvesa.c
index 7032bb94..0c2574db 100644
--- a/com32/lib/sys/vesa/initvesa.c
+++ b/com32/lib/sys/vesa/initvesa.c
@@ -164,7 +164,7 @@ static int vesacon_set_mode(void)
       continue;
 
     /* We don't support multibank (interlaced memory) modes */
-    /* 
+    /*
      *  Note: The Bochs VESA BIOS (vbe.c 1.58 2006/08/19) violates the
      * specification which states that banks == 1 for unbanked modes;
      * fortunately it does report bank_size == 0 for those.
diff --git a/com32/lib/sys/vesa/screencpy.c b/com32/lib/sys/vesa/screencpy.c
index a3043fd4..a63a1ccf 100644
--- a/com32/lib/sys/vesa/screencpy.c
+++ b/com32/lib/sys/vesa/screencpy.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 2008 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
@@ -61,13 +61,13 @@ void __vesacon_init_copy_to_screen(void)
     wi.win_num  = -1;		/* Not a window */
   } else {
     /* Paged frame buffer */
-    
+
     /* We have already tested that *one* of these is usable */
     if ((mi->win_attr[0] & 0x05) == 0x05 && mi->win_seg[0])
       winn = 0;
     else
       winn = 1;
-    
+
     wi.win_num    = winn;
     wi.win_base   = (char *)(mi->win_seg[winn] << 4);
     wi.win_size   = mi->win_size << 10;
diff --git a/com32/lib/syslinux/getadv.c b/com32/lib/syslinux/getadv.c
index a4fb3f5e..3cb1785b 100644
--- a/com32/lib/syslinux/getadv.c
+++ b/com32/lib/syslinux/getadv.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 2007-2008 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
diff --git a/com32/lib/syslinux/reboot.c b/com32/lib/syslinux/reboot.c
index 110755f5..49b370e5 100644
--- a/com32/lib/syslinux/reboot.c
+++ b/com32/lib/syslinux/reboot.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 2007-2008 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
@@ -38,7 +38,7 @@
 __noreturn syslinux_reboot(int warm)
 {
   uint16_t * const reboot_flag = (uint16_t *)0x472;
-  
+
   *reboot_flag = warm ? 0x1234 : 0;
   __farcall(0xf000, 0xfff0, &__com32_zero_regs, NULL);
 
diff --git a/com32/libutil/base64.c b/com32/libutil/base64.c
index 7812bfe1..7ad21599 100644
--- a/com32/libutil/base64.c
+++ b/com32/libutil/base64.c
@@ -92,4 +92,3 @@ int main(int argc, char *argv[])
 }
 
 #endif
-
diff --git a/com32/menu/background.c b/com32/menu/background.c
index 1792cf18..49839cdc 100644
--- a/com32/menu/background.c
+++ b/com32/menu/background.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 2008 H. Peter Anvin - All Rights Reserved
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -24,4 +24,3 @@ void set_background(const char *new_background)
     current_background = new_background;
   }
 }
-
diff --git a/com32/menu/colors.c b/com32/menu/colors.c
index 0529d64b..9b1a19aa 100644
--- a/com32/menu/colors.c
+++ b/com32/menu/colors.c
@@ -144,16 +144,16 @@ struct color_table *default_color_table(void)
   for (i = 0; i < 256; i++) {
     cp->name = mp;
     mp += sprintf(mp, "msg%02x", i)+1;
-    
+
     rsprintf(&cp->ansi, "%s3%d;4%d", (i & 8) ? "1;" : "",
 	     pc2ansi[i & 7], pc2ansi[(i >> 4) & 7]);
     cp++;
   }
-    
+
   /*** XXX: This needs to move to run_menu() ***/
   console_color_table = color_table;
   console_color_table_size = NCOLORS+256;
-  
+
   set_msg_colors_global(color_table, MSG_COLORS_DEF_FG,
 			MSG_COLORS_DEF_BG, MSG_COLORS_DEF_SHADOW);
 
@@ -180,5 +180,3 @@ struct color_table *copy_color_table(const struct color_table *master)
 
   return color_table;
 }
-
-  
diff --git a/com32/menu/menu.h b/com32/menu/menu.h
index 22880230..d9bbd608 100644
--- a/com32/menu/menu.h
+++ b/com32/menu/menu.h
@@ -97,7 +97,7 @@ enum parameter_number {
   P_HSHIFT,
   P_VSHIFT,
   P_HIDDEN_ROW,
-  
+
   NPARAMS
 };
 
diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
index 554ad918..756cb210 100644
--- a/com32/menu/readconfig.c
+++ b/com32/menu/readconfig.c
@@ -73,7 +73,7 @@ static struct menu *
 find_menu(const char *label)
 {
   struct menu *m;
-  
+
   for (m = menu_list; m; m = m->next) {
     if (!strcmp(label, m->label))
       return m;
@@ -262,7 +262,7 @@ record(struct menu *m, struct labeldata *ld, const char *append)
     me->label       = refstr_get(ld->label);
     me->passwd      = refstr_get(ld->passwd);
     me->helptext    = ld->helptext;
-    me->hotkey 	    = 0;
+    me->hotkey	    = 0;
     me->action	    = ld->action ? ld->action : MA_CMD;
 
     if ( ld->menuindent ) {
@@ -293,7 +293,7 @@ record(struct menu *m, struct labeldata *ld, const char *append)
     case MA_CMD:
       ipp = ipoptions;
       *ipp = '\0';
-      
+
       if (ld->ipappend) {
 	ipappend = syslinux_ipappend_strings();
 	for (i = 0; i < ipappend->count; i++) {
diff --git a/com32/menu/refstr.c b/com32/menu/refstr.c
index 8b4c7183..868a8ac8 100644
--- a/com32/menu/refstr.c
+++ b/com32/menu/refstr.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 2008 H. Peter Anvin - All Rights Reserved
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -95,7 +95,7 @@ void refstr_put(const char *r)
 
   if (r) {
     ref = (unsigned int *)r - 1;
-    
+
     if (!--*ref)
       free(ref);
   }
diff --git a/doc/extlinux.doc b/doc/extlinux.doc
index 2508fa1c..3604a29d 100644
--- a/doc/extlinux.doc
+++ b/doc/extlinux.doc
@@ -74,7 +74,7 @@ It works the same way as SYSLINUX, with a few slight modifications.
    The --once, --clear-once, and --reset-adv commands can be combined
    with --install or --update, if desired.  The ADV is preserved
    across updates, unless --reset-adv is specified.
-   
+
 
 Note that EXTLINUX installs in the filesystem partition like a
 well-behaved bootloader :)  Thus, it needs a master boot record in the
diff --git a/doc/menu.doc b/doc/menu.doc
index 3b95a031..ebefe9e4 100644
--- a/doc/menu.doc
+++ b/doc/menu.doc
@@ -44,8 +44,8 @@ MENU TITLE title
 MENU HIDDEN
 
 	Do not display the actual menu unless the user presses a key.
-	All that is displayed is a timeout message.     
-     
+	All that is displayed is a timeout message.
+
 MENU SEPARATOR
 
 	Insert an empty line in the menu.
@@ -91,12 +91,12 @@ MENU DISABLE
 	Makes the entry unselectable.  This allows you to make a
 	section in your menu with different options below it.
 	for example:
-	
+
 	# Entries for network boots
 	LABEL -
 		MENU LABEL Network:
 		MENU DISABLE
-	
+
 	# Soft Cap Linux
 	LABEL softcap
 		MENU LABEL Soft Cap ^Linux 9.6.36
@@ -223,7 +223,7 @@ MENU QUIT
 	WARNING: if MENU MASTER PASSWD or ALLOWOPTIONS 0 is set, this
 	will still allow exiting to the CLI; however, a separate MENU
 	PASSWD can of course be set for this label.
-	
+
 
 INCLUDE filename [tagname]
 MENU INCLUDE filename [tagname]
diff --git a/extlinux/extlinux.c b/extlinux/extlinux.c
index 742859a9..101a4abe 100644
--- a/extlinux/extlinux.c
+++ b/extlinux/extlinux.c
@@ -931,7 +931,7 @@ modify_existing_adv(const char *path)
     syslinux_reset_adv(syslinux_adv);
   else if (read_adv(path) < 0)
     return 1;
-    
+
   if (modify_adv() < 0)
     return 1;
 
diff --git a/libinstaller/setadv.c b/libinstaller/setadv.c
index 4756a97d..c768d1b1 100644
--- a/libinstaller/setadv.c
+++ b/libinstaller/setadv.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -37,11 +37,11 @@ static void cleanup_adv(unsigned char *advbuf)
 
   /* Make sure both copies agree, and update the checksum */
   set_32(advbuf, ADV_MAGIC1);
-  
+
   csum = ADV_MAGIC2;
   for (i = 8; i < ADV_SIZE-4; i += 4)
     csum -= get_32(advbuf+i);
-  
+
   set_32(advbuf+4, csum);
   set_32(advbuf+ADV_SIZE-4, ADV_MAGIC3);
 
@@ -157,4 +157,3 @@ int syslinux_validate_adv(unsigned char *advbuf)
     return -1;
   }
 }
-
diff --git a/libinstaller/syslxint.h b/libinstaller/syslxint.h
index 852f9e36..120026de 100644
--- a/libinstaller/syslxint.h
+++ b/libinstaller/syslxint.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------- *
- *   
+ *
  *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/lstadjust.pl b/lstadjust.pl
index e2e395fe..381c86c3 100755
--- a/lstadjust.pl
+++ b/lstadjust.pl
@@ -37,7 +37,7 @@ $offset = 0;
 
 while (defined($line = <LST>)) {
     chomp $line;
-    
+
     $source = substr($line, 40);
     if ($source =~ /^([^;]*);/) {
 	$source = $1;
@@ -61,4 +61,3 @@ while (defined($line = <LST>)) {
 
     print OUT $line, "\n";
 }
-
diff --git a/man/lss16toppm.1 b/man/lss16toppm.1
index d0e61c40..90447b97 100644
--- a/man/lss16toppm.1
+++ b/man/lss16toppm.1
@@ -3,7 +3,7 @@
 lss16toppm \(em Convert an LSS-16 image to PPM
 .SH "SYNOPSIS"
 .PP
-\fBlss16toppm\fR [\fB-map\fP]  [< file.lss]  [> file.ppm] 
+\fBlss16toppm\fR [\fB-map\fP]  [< file.lss]  [> file.ppm]
 .SH "DESCRIPTION"
 .PP
 This manual page documents briefly the \fBlss16toppm\fR       command.
diff --git a/man/syslinux.1 b/man/syslinux.1
index d0b5cb6c..70d44d1b 100644
--- a/man/syslinux.1
+++ b/man/syslinux.1
@@ -4,8 +4,8 @@ syslinux \- install the \s-1SYSLINUX\s+1 bootloader on a FAT filesystem
 .SH SYNOPSIS
 .B syslinux
 [\fB\-sfr\fP]
-[\fB\-d\fP \fIdirectory\fP] 
-[\fB\-o\fP \fIoffset\fP] 
+[\fB\-d\fP \fIdirectory\fP]
+[\fB\-o\fP \fIoffset\fP]
 .I device
 .SH DESCRIPTION
 \fBSyslinux\fP is a boot loader for the Linux operating system which
diff --git a/mbr/oldmbr.asm b/mbr/oldmbr.asm
index 983a7f05..26fb022b 100644
--- a/mbr/oldmbr.asm
+++ b/mbr/oldmbr.asm
@@ -154,7 +154,7 @@ no_ebios:
 		mov dh,al
 		inc ah
 		or cl,ah			; CX = cylinder and sector
-		
+
 		mov dl,[DriveNo]
 		mov bx,7C00h
 		mov ax,0201h			; Read one sector
diff --git a/memdisk/setup.c b/memdisk/setup.c
index b611bbca..829893a7 100644
--- a/memdisk/setup.c
+++ b/memdisk/setup.c
@@ -776,7 +776,7 @@ void setup(syscall_t cs_syscall, void *cs_bounce)
     regs.eax.b[1] = 0x08;
     regs.edx.b[0] = geometry->driveno & 0x80;
     syscall(0x13, &regs, &regs);
-    
+
     if ( regs.eflags.l & 1 ) {
       printf("INT 13 08: Failure, assuming this is the only drive\n");
       pptr->drivecnt = 0;
@@ -785,19 +785,19 @@ void setup(syscall_t cs_syscall, void *cs_bounce)
 	     regs.edx.b[0], regs.es, regs.edi.w[0]);
       pptr->drivecnt = regs.edx.b[0];
     }
-    
+
     /* Compare what INT 13h returned with the appropriate equipment byte */
     if ( geometry->driveno & 0x80 ) {
       bios_drives = rdz_8(BIOS_HD_COUNT);
     } else {
       uint8_t equip = rdz_8(BIOS_EQUIP);
-      
+
       if (equip & 1)
 	bios_drives = (equip >> 6)+1;
       else
 	bios_drives = 0;
     }
-    
+
     if (pptr->drivecnt > bios_drives) {
       printf("BIOS equipment byte says count = %d, go with that\n",
 	     bios_drives);
diff --git a/memdump/ymodem.txt b/memdump/ymodem.txt
index 24a65781..2264ff78 100644
--- a/memdump/ymodem.txt
+++ b/memdump/ymodem.txt
@@ -2106,7 +2106,3 @@
 
 
                                       - ii -
-
-
-
-