lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: coding style fixes to arch/x86/boot/compressed/misc.c

Browse Source 
Fix lots of style errors and warnings.

Before:
   total: 58 errors, 9 warnings, 469 lines checked
After:
   total: 7 errors, 8 warnings, 471 lines checked

No code changed:

arch/x86/boot/compressed/misc.o:

   text	   data	    bss	    dec	    hex	filename
  10716	      8	   2152	  12876	   324c	misc.o.before
  10716	      8	   2152	  12876	   324c	misc.o.after

md5:
   2c20c903986a3c9bca44306c6646067e  misc.o.before.asm
   2c20c903986a3c9bca44306c6646067e  misc.o.after.asm

Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Paolo Ciarrocchi
2008-02-21 00:19:10 +01:00
committed by Ingo Molnar
parent 48e6b7a050
commit fd77c7cabd
1 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/boot/compressed/misc.c
View File

@@ -127,7 +127,8 @@ typedef unsigned char uch;
typedef unsigned short ush; typedef unsigned short ush;
typedef unsigned long ulg; typedef unsigned long ulg;
#define WSIZE 0x80000000 /* Window size must be at least 32k, #define WSIZE 0x80000000 /*
* Window size must be at least 32k,
* and a power of two * and a power of two
* We don't actually have a window just * We don't actually have a window just
* a huge output buffer so I report * a huge output buffer so I report
@@ -190,7 +191,7 @@ static unsigned char *real_mode; /* Pointer to real-mode data */
extern unsigned char input_data[]; extern unsigned char input_data[];
extern int input_len; extern int input_len;
static long bytes_out = 0; static long bytes_out;
static void *malloc(int size); static void *malloc(int size);
static void free(void *where); static void free(void *where);
@@ -229,8 +230,10 @@ static void *malloc(int size)
{ {
void *p; void *p;
if (size <0) error("Malloc error"); if (size < 0)
if (free_mem_ptr <= 0) error("Memory error"); error("Malloc error");
if (free_mem_ptr <= 0)
error("Memory error");
free_mem_ptr = (free_mem_ptr + 3) & ~3; /* Align */ free_mem_ptr = (free_mem_ptr + 3) & ~3; /* Align */
@@ -386,8 +389,7 @@ static void parse_elf(void *output)
if (ehdr.e_ident[EI_MAG0] != ELFMAG0 || if (ehdr.e_ident[EI_MAG0] != ELFMAG0 ||
ehdr.e_ident[EI_MAG1] != ELFMAG1 || ehdr.e_ident[EI_MAG1] != ELFMAG1 ||
ehdr.e_ident[EI_MAG2] != ELFMAG2 || ehdr.e_ident[EI_MAG2] != ELFMAG2 ||
ehdr.e_ident[EI_MAG3] != ELFMAG3) ehdr.e_ident[EI_MAG3] != ELFMAG3) {
{
error("Kernel is not a valid ELF file"); error("Kernel is not a valid ELF file");
return; return;
} }