Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd77c7ca authored by Paolo Ciarrocchi's avatar Paolo Ciarrocchi Committed by Ingo Molnar
Browse files

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



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: default avatarPaolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 48e6b7a0

arch/x86/boot/compressed/misc.c

+34 −32
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ typedef unsigned char uch; 
typedef unsigned short ush;

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

				 * We don't actually have a window just

				 * 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 int input_len;



static long bytes_out = 0;

static long bytes_out;



static void *malloc(int size);

static void free(void *where);
@@ -229,8 +230,10 @@ static void *malloc(int size) 
{

	void *p;



	if (size <0) error("Malloc error");

	if (free_mem_ptr <= 0) error("Memory error");

	if (size < 0)

		error("Malloc error");

	if (free_mem_ptr <= 0)

		error("Memory error");



	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 ||

	   ehdr.e_ident[EI_MAG1] != ELFMAG1 ||

	   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");

		return;

	}