Decompressors: Get rid of set_error_fn() macro
PATCH 1/1 Decompressors: Get rid of set_error_fn() macro
From: Lasse Collin <[email protected]>
set_error_fn() has become a useless complication after the commit c1e7c3ae59b065bf7ff24a05cb609b2f9e314db6 fixed the use of error() in malloc(). Only decompress_unlzma.c had some use for it and that was easy to change too.
This also gets rid of the static function pointer "error", which should have been marked as __initdata.
Signed-off-by Lasse Collin <[email protected]>
---
include/linux/decompress/mm.h | 5 ----- lib/decompress_bunzip2.c | 7 +++---- lib/decompress_inflate.c | 3 +-- lib/decompress_unlzma.c | 11 ++++++----- lib/decompress_unlzo.c | 4 +--- 5 files changed, 11 insertions(+), 19 deletions(-)
include/linux/decompress/mm.h +0 -5
@@ -61,8 +61,6 @@ static void free(void *where)#define large_malloc (a) malloc(a)#define large_free (a) free(a) -#define set_error_fn (x) -#define INIT #else /* STATIC */
@@ -84,9 +82,6 @@ static void free(void *where)#define large_malloc (a) vmalloc(a)#define large_free (a) vfree(a) -static void (*error)(char *m); -#define set_error_fn (x) error = x; -#define INIT __init#define STATIC
lib/decompress_bunzip2.c +3 -4
@@ -682,13 +682,12 @@ STATIC int INIT bunzip2(unsigned char *bint (*flush)(void *,unsigned int ), unsigned char *outbuf, int *pos, - void(*error_fn)(char *x)) + void(*error)(char *x)) { struct bunzip_data *bd;int i =-1 ;unsigned char *inbuf; -set_error_fn (error_fn);if (flush) outbuf =malloc (BZIP2_IOBUF_SIZE );
@@ -751,8 +750,8 @@ STATIC int INIT decompress(unsigned charint (*flush)(void *,unsigned int ), unsigned char *outbuf, int *pos, - void(*error_fn)(char *x)) + void(*error)(char *x)) { - return bunzip2(buf, len - 4, fill, flush, outbuf, pos, error_fn); + return bunzip2(buf, len - 4, fill, flush, outbuf, pos, error); } #endif
lib/decompress_inflate.c +1 -2
@@ -38,13 +38,12 @@ STATIC int INIT gunzip(unsigned char *buint (*flush)(void *,unsigned int ), unsigned char *out_buf, int *pos, - void(*error_fn)(char *x)) { + void(*error)(char *x)) { u8 *zbuf;struct z_stream_s *strm;int rc;size_t out_len; -set_error_fn (error_fn); rc =-1 ;if (flush) { out_len =0x8000 ;/* 32 K */
lib/decompress_unlzma.c +6 -5
@@ -74,6 +74,7 @@ struct rc {uint32_t code;uint32_t range;uint32_t bound; +void (*error)(char *); };
@@ -92,7 +93,7 @@ static void INIT rc_read(struct rc *rc) { rc->buffer_size = rc->fill ((char *)rc->buffer,LZMA_IOBUF_SIZE );if (rc->buffer_size <=0 ) -error ("unexpected EOF" ); + rc->error ("unexpected EOF" ); rc->ptr = rc->buffer; rc->buffer_end = rc->buffer + rc->buffer_size; }
@@ -536,7 +537,7 @@ STATIC inline int INIT unlzma(unsigned cint (*flush)(void *,unsigned int ), unsigned char *output, int *posp, - void(*error_fn)(char *x) + void(*error)(char *x) ) { struct lzma_header header;
@@ -552,7 +553,7 @@ STATIC inline int INIT unlzma(unsigned cunsigned char *inbuf;int ret =-1 ; -set_error_fn (error_fn); + rc.error = error;if (buf) inbuf = buf;
@@ -659,9 +660,9 @@ STATIC int INIT decompress(unsigned charint (*flush)(void *,unsigned int ), unsigned char *output, int *posp, - void(*error_fn)(char *x) + void(*error)(char *x) ) { - return unlzma(buf, in_len - 4, fill, flush, output, posp, error_fn); + return unlzma(buf, in_len - 4, fill, flush, output, posp, error); } #endif
lib/decompress_unlzo.c +1 -3
@@ -91,7 +91,7 @@ STATIC inline int INIT unlzo(u8 *input,int (*fill) (void *,unsigned int ), int (*flush) (void *, unsigned int), u8 *output, int *posp, - void (*error_fn) (char *x)) + void (*error) (char *x)) { u8 skip =0 , r =0 ;u32 src_len, dst_len;
@@ -99,8 +99,6 @@ STATIC inline int INIT unlzo(u8 *input,u8 *in_buf, *in_buf_save, *out_buf;int ret =-1 ; -set_error_fn (error_fn); -if (output) { out_buf = output; }else if (!flush) {