Since some people disapprove of white space cleanups mixed in regular commits

while others dislike them being extra commits, let's clean them up once and
for all for the existing code. If it's ugly, let it only be ugly once :-)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5507 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

10 files changed, 39 insertions, 40 deletions

diff --git a/util/mkelfImage/kunzip_src/arch/alpha/include/stdint.h b/util/mkelfImage/kunzip_src/arch/alpha/include/stdint.h
index 9b93a0c84f..9da5cc4972 100644
--- a/util/mkelfImage/kunzip_src/arch/alpha/include/stdint.h
+++ b/util/mkelfImage/kunzip_src/arch/alpha/include/stdint.h
@@ -3,7 +3,7 @@
 
 /* Exact integral types */
 typedef unsigned char      uint8_t;
-typedef signed char        int8_t; 
+typedef signed char        int8_t;
 
 typedef unsigned short     uint16_t;
 typedef signed short       int16_t;
@@ -17,7 +17,7 @@ typedef signed long        int64_t;
 
 /* Small types */
 typedef unsigned char      uint_least8_t;
-typedef signed char        int_least8_t; 
+typedef signed char        int_least8_t;
 
 typedef unsigned short     uint_least16_t;
 typedef signed short       int_least16_t;
@@ -30,7 +30,7 @@ typedef signed long        int_least64_t;
 
 /* Fast Types */
 typedef unsigned char      uint_fast8_t;
-typedef signed char        int_fast8_t; 
+typedef signed char        int_fast8_t;
 
 typedef unsigned long      uint_fast16_t;
 typedef signed long        int_fast16_t;
diff --git a/util/mkelfImage/kunzip_src/arch/alpha/lib/divide.S b/util/mkelfImage/kunzip_src/arch/alpha/lib/divide.S
index a4bc1f751e..863e881348 100644
--- a/util/mkelfImage/kunzip_src/arch/alpha/lib/divide.S
+++ b/util/mkelfImage/kunzip_src/arch/alpha/lib/divide.S
@@ -19,7 +19,7 @@
  * These are not normal C functions: instead of the normal
  * calling sequence, these expect their arguments in registers
  * $24 and $25, and return the result in $27. Register $28 may
- * be clobbered (assembly temporary), anything else must be saved. 
+ * be clobbered (assembly temporary), anything else must be saved.
  *
  * In short: painful.
  *
diff --git a/util/mkelfImage/kunzip_src/arch/alpha/lib/kunzip.lds b/util/mkelfImage/kunzip_src/arch/alpha/lib/kunzip.lds
index ed632686a8..467e64d100 100644
--- a/util/mkelfImage/kunzip_src/arch/alpha/lib/kunzip.lds
+++ b/util/mkelfImage/kunzip_src/arch/alpha/lib/kunzip.lds
@@ -21,18 +21,18 @@ SECTIONS
 	/* Global data */
 	.data : {
 		_data = .;
-		*(.data) 
+		*(.data)
 		CONSTRUCTORS
 		*(.got)
 		*(.sdata)
 		_edata = .;
 	}
-	
+
 	/* Important align _bss so bss may be zeroed with quadword access */
 	. = ALIGN(BASIC_ALIGN);
 	.bss : {
 		_bss = .;
-		*(.sbss) 
+		*(.sbss)
 		*(.scommon)
 		*(.bss)
 		*(COMMON)
diff --git a/util/mkelfImage/kunzip_src/arch/i386/include/stdint.h b/util/mkelfImage/kunzip_src/arch/i386/include/stdint.h
index 58d7519cde..f24aab1294 100644
--- a/util/mkelfImage/kunzip_src/arch/i386/include/stdint.h
+++ b/util/mkelfImage/kunzip_src/arch/i386/include/stdint.h
@@ -3,7 +3,7 @@
 
 /* Exact integral types */
 typedef unsigned char      uint8_t;
-typedef signed char        int8_t; 
+typedef signed char        int8_t;
 
 typedef unsigned short     uint16_t;
 typedef signed short       int16_t;
@@ -16,7 +16,7 @@ typedef signed long long   int64_t;
 
 /* Small types */
 typedef unsigned char      uint_least8_t;
-typedef signed char        int_least8_t; 
+typedef signed char        int_least8_t;
 
 typedef unsigned short     uint_least16_t;
 typedef signed short       int_least16_t;
@@ -29,7 +29,7 @@ typedef signed long long   int_least64_t;
 
 /* Fast Types */
 typedef unsigned char      uint_fast8_t;
-typedef signed char        int_fast8_t; 
+typedef signed char        int_fast8_t;
 
 typedef unsigned int       uint_fast16_t;
 typedef signed int         int_fast16_t;
diff --git a/util/mkelfImage/kunzip_src/arch/i386/lib/kunzip.lds b/util/mkelfImage/kunzip_src/arch/i386/lib/kunzip.lds
index 0e649005cf..4d95da42f5 100644
--- a/util/mkelfImage/kunzip_src/arch/i386/lib/kunzip.lds
+++ b/util/mkelfImage/kunzip_src/arch/i386/lib/kunzip.lds
@@ -21,18 +21,18 @@ SECTIONS
 	/* Global data */
 	.data : {
 		_data = .;
-		*(.data) 
+		*(.data)
 		CONSTRUCTORS
 		*(.got)
 		*(.sdata)
 		_edata = .;
 	}
-	
+
 	/* Important align _bss so bss may be zeroed with quadword access */
 	. = ALIGN(BASIC_ALIGN);
 	.bss : {
 		_bss = .;
-		*(.sbss) 
+		*(.sbss)
 		*(.scommon)
 		*(.bss)
 		*(COMMON)
diff --git a/util/mkelfImage/kunzip_src/arch/i386/lib/start.S b/util/mkelfImage/kunzip_src/arch/i386/lib/start.S
index fec7c9da66..80ad476ae0 100644
--- a/util/mkelfImage/kunzip_src/arch/i386/lib/start.S
+++ b/util/mkelfImage/kunzip_src/arch/i386/lib/start.S
@@ -33,4 +33,3 @@ jmp_to_program_entry:
 	movl 24+__original_registers, %esp
 	movl 28+__original_registers, %ebp
 	jmp *__entry
-	
\ No newline at end of file
diff --git a/util/mkelfImage/kunzip_src/include/stdarg.h b/util/mkelfImage/kunzip_src/include/stdarg.h
index 24f3383198..a3f1f2d587 100644
--- a/util/mkelfImage/kunzip_src/include/stdarg.h
+++ b/util/mkelfImage/kunzip_src/include/stdarg.h
@@ -136,7 +136,7 @@ void va_end (__gnuc_va_list);		/* Defined in libgcc.a */
 /* Define va_list, if desired, from __gnuc_va_list. */
 /* We deliberately do not define va_list when called from
    stdio.h, because ANSI C says that stdio.h is not supposed to define
-   va_list.  stdio.h needs to have access to that data type, 
+   va_list.  stdio.h needs to have access to that data type,
    but must not use that name.  It should use the name __gnuc_va_list,
    which is safe because it is reserved for the implementation.  */
 
diff --git a/util/mkelfImage/kunzip_src/include/string.h b/util/mkelfImage/kunzip_src/include/string.h
index dbaa1ecd17..fa301c822e 100644
--- a/util/mkelfImage/kunzip_src/include/string.h
+++ b/util/mkelfImage/kunzip_src/include/string.h
@@ -3,23 +3,23 @@
 
 #include <stddef.h>
 
-// yes, linux has fancy ones. We don't care. This stuff gets used 
+// yes, linux has fancy ones. We don't care. This stuff gets used
 // hardly at all. And the pain of including those files is just too high.
 
 //extern inline void strcpy(char *dst, char *src) {while (*src) *dst++ = *src++;}
 
 //extern inline int strlen(char *src) { int i = 0; while (*src++) i++; return i;}
 
-static inline size_t strnlen(const char *src, size_t max) { 
-  int i = 0; 
+static inline size_t strnlen(const char *src, size_t max) {
+  int i = 0;
   if (max<0) {
-    while (*src++) 
-      i++; 
+    while (*src++)
+      i++;
     return i;
   }
   else {
-    while ((*src++) && (i < max)) 
-      i++; 
+    while ((*src++) && (i < max))
+      i++;
     return i;
   }
 }
diff --git a/util/mkelfImage/kunzip_src/lib/inflate.c b/util/mkelfImage/kunzip_src/lib/inflate.c
index 894a98cd27..82818a6d53 100644
--- a/util/mkelfImage/kunzip_src/lib/inflate.c
+++ b/util/mkelfImage/kunzip_src/lib/inflate.c
@@ -1,5 +1,5 @@
-#define DEBG(x)  
-#define DEBG1(x)  
+#define DEBG(x)
+#define DEBG1(x)
 /* Taken from /usr/src/linux/lib/inflate.c [unmodified]
    Used for start32, 1/11/2000
    James Hendricks, Dale Webster */
@@ -7,9 +7,9 @@
 /* inflate.c -- Not copyrighted 1992 by Mark Adler
    version c10p1, 10 January 1993 */
 
-/* 
+/*
  * Adapted for booting Linux by Hannu Savolainen 1993
- * based on gzip-1.0.3 
+ * based on gzip-1.0.3
  *
  * Nicolas Pitre <nico@cam.org>, 1999/04/14 :
  *   Little mods for all variable to reside either into rodata or bss segments
@@ -54,7 +54,7 @@
    chunks), otherwise the dynamic method is used.  In the latter case, the
    codes are customized to the probabilities in the current block, and so
    can code it much better than the pre-determined fixed codes.
- 
+
    The Huffman codes themselves are decoded using a multi-level table
    lookup, in order to maximize the speed of decoding plus the speed of
    building the decoding tables.  See the comments below that precede the
@@ -121,7 +121,7 @@ static char rcsid[] = "#Id: inflate.c,v 0.14 1993/06/10 13:27:04 jloup Exp #";
 #include "gzip.h"
 #define STATIC
 #endif /* !STATIC */
-	
+
 #define slide window
 
 /* Huffman code lookup table entry--this entry is four bytes for machines
@@ -142,7 +142,7 @@ struct huft {
 
 
 /* Function prototypes */
-STATIC int huft_build OF((unsigned *, unsigned, unsigned, 
+STATIC int huft_build OF((unsigned *, unsigned, unsigned,
 		const ush *, const ush *, struct huft **, int *));
 STATIC int huft_free OF((struct huft *));
 STATIC int inflate_codes OF((struct huft *, struct huft *, int, int));
@@ -188,7 +188,7 @@ static const ush cpdext[] = {         /* Extra bits for distance codes */
 
 /* Macros for inflate() bit peeking and grabbing.
    The usage is:
-   
+
         NEEDBITS(j)
         x = b & mask_bits[j];
         DUMPBITS(j)
@@ -315,7 +315,7 @@ DEBG("huft1 ");
   memzero(c, sizeof(c));
   p = b;  i = n;
   do {
-    Tracecv(*p, (stderr, (n-i >= ' ' && n-i <= '~' ? "%c %d\n" : "0x%x %d\n"), 
+    Tracecv(*p, (stderr, (n-i >= ' ' && n-i <= '~' ? "%c %d\n" : "0x%x %d\n"),
 	    n-i, *p));
     c[*p]++;                    /* assume all entries <= BMAX */
     p++;                      /* Can't combine with above line (Solaris bug) */
@@ -509,7 +509,7 @@ struct huft *t;         /* table to free */
     q = (--p)->v.t;
     free((char*)p);
     p = q;
-  } 
+  }
   return 0;
 }
 
@@ -978,7 +978,7 @@ STATIC int inflate()
     hufts = 0;
     malloc_mark(&mark);
     if ((r = inflate_block(&e)) != 0) {
-      malloc_release(&mark);	    
+      malloc_release(&mark);
       return r;
     }
     malloc_release(&mark);
@@ -1014,7 +1014,7 @@ static ulg crc;		/* initialized in makecrc() so it'll reside in bss */
 #define CRC_VALUE (crc ^ 0xffffffffL)
 
 /*
- * Code to compute the CRC-32 table. Borrowed from 
+ * Code to compute the CRC-32 table. Borrowed from
  * gzip-1.0.3/makecrc.c.
  */
 
@@ -1122,7 +1122,7 @@ int gunzip(void)
     if ((flags & ORIG_NAME) != 0) {
 	    /* Discard the old name */
 	    while (get_byte() != 0) /* null */ ;
-    } 
+    }
 
     /* Discard file comment if any */
     if ((flags & COMMENT) != 0) {
@@ -1148,7 +1148,7 @@ int gunzip(void)
 	    }
 	    return -1;
     }
-	    
+
     /* Get the crc and original length */
     /* crc32  (see algorithm.doc)
      * uncompressed input size modulo 2^32
@@ -1157,12 +1157,12 @@ int gunzip(void)
     orig_crc |= (ulg) get_byte() << 8;
     orig_crc |= (ulg) get_byte() << 16;
     orig_crc |= (ulg) get_byte() << 24;
-    
+
     orig_len = (ulg) get_byte();
     orig_len |= (ulg) get_byte() << 8;
     orig_len |= (ulg) get_byte() << 16;
     orig_len |= (ulg) get_byte() << 24;
-    
+
     /* Validate decompression */
     if (orig_crc != CRC_VALUE) {
 	    error("crc error");
diff --git a/util/mkelfImage/kunzip_src/lib/kunzip.c b/util/mkelfImage/kunzip_src/lib/kunzip.c
index 4bfe504f70..b8ae1c1ecc 100644
--- a/util/mkelfImage/kunzip_src/lib/kunzip.c
+++ b/util/mkelfImage/kunzip_src/lib/kunzip.c
@@ -7,7 +7,7 @@
  */
 
 #ifdef DEBUG
-#  define Trace(x) 
+#  define Trace(x)
 #  define Tracev(x)
 #  define Tracevv(x)
 #  define Tracec(c,x)
@@ -113,7 +113,7 @@ static void flush_window(void)
 			limit = outcnt;
 		}
 		out = output_ptr;
-		DBG(("flush 0x%08lx start 0x%08lx limit 0x%08lx\n", 
+		DBG(("flush 0x%08lx start 0x%08lx limit 0x%08lx\n",
 			(unsigned long) out, (unsigned long)n, limit));
 		for (; n < limit; n++) {
 			ch = *out++ = *in++;