x86: coding style fixes to arch/x86/boot/compressed/misc.c (fd77c7ca) · Commits · 戴 / test

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