move prototype for gunzip() to common.h
Subsystems (2)
PATCH 1/1 move prototype for gunzip() to common.h
Prototype for gunzip was only in lib_generic/gunzip.c and thus repeated in every file using it. This patch moves the prototype to common.h and removes all prototypes distributed anywhere else.
--- board/bf527-ezkit/video.c | 2 -- board/bf533-stamp/video.c | 2 -- board/bf548-ezkit/video.c | 2 -- board/cm-bf548/video.c | 2 -- board/dave/PPChameleonEVB/PPChameleonEVB.c | 3 --- board/esd/apc405/apc405.c | 3 --- board/esd/ash405/ash405.c | 4 ---- board/esd/cpci405/cpci405.c | 1 - board/esd/hh405/hh405.c | 4 ---- board/esd/pci405/pci405.c | 1 - board/esd/plu405/plu405.c | 3 --- board/esd/tasreg/tasreg.c | 1 - board/esd/voh405/voh405.c | 4 ---- board/esd/wuh405/wuh405.c | 4 ---- board/mpl/common/common_util.c | 1 - board/prodrive/pdnb3/pdnb3.c | 1 - common/cmd_bmp.c | 2 -- common/cmd_bootm.c | 1 - common/cmd_license.c | 1 - common/cmd_mem.c | 2 -- drivers/video/cfb_console.c | 2 -- include/common.h | 3 +++ lib_generic/gunzip.c | 1 - 23 files changed, 3 insertions(+), 47 deletions(-)
board/bf527-ezkit/video.c +0 -2
@@ -16,8 +16,6 @@#include <linux/types.h> #include <stdio_dev.h> -int gunzip (void *,int ,unsigned char *,unsigned long *); -#define DMA_SIZE16 2#include <asm/mach-common/bits/ppi.h>
board/bf533-stamp/video.c +0 -2
@@ -20,8 +20,6 @@#include <linux/types.h> #include <stdio_dev.h> -int gunzip (void *,int ,unsigned char *,unsigned long *); -#define DMA_SIZE16 2#include <asm/mach-common/bits/ppi.h>
board/bf548-ezkit/video.c +0 -2
@@ -16,8 +16,6 @@#include <linux/types.h> #include <stdio_dev.h> -int gunzip (void *,int ,unsigned char *,unsigned long *); -#define DMA_SIZE16 2#include <asm/mach-common/bits/eppi.h>
board/cm-bf548/video.c +0 -2
@@ -16,8 +16,6 @@#include <linux/types.h> #include <stdio_dev.h> -int gunzip (void *,int ,unsigned char *,unsigned long *); -#ifdef CONFIG_VIDEO #define DMA_SIZE16 2
board/dave/PPChameleonEVB/PPChameleonEVB.c +0 -3
@@ -33,9 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;/* ------------------------------------------------------------------------- */ -/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *); -int board_early_init_f (void ) {out32 (GPIO0_OR ,CONFIG_SYS_NAND0_CE );/* set initial outputs */
board/esd/apc405/apc405.c +0 -3
@@ -54,9 +54,6 @@ const unsigned char fpgadata[] =*/ #include "../common/fpga.c" -/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *); -#ifdef CONFIG_LCD_USED /* logo bitmap data - gzip compressed and generated by bin2c */ unsigned char logo_bmp[] =
board/esd/ash405/ash405.c +0 -4
@@ -48,10 +48,6 @@ const unsigned char fpgadata[] =#include "../common/fpga.c" -/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *); - -int board_early_init_f (void ) {/*
board/esd/cpci405/cpci405.c +0 -1
@@ -89,7 +89,6 @@ int N_AU_IMAGES = (sizeof(au_image) / sizeof(au_image[0]));/* Prototypes */ int cpci405_version (void ); -int gunzip (void *,int ,unsigned char *,unsigned long *);void lxt971_no_sleep (void );int board_early_init_f (void )
board/esd/hh405/hh405.c +0 -4
@@ -251,10 +251,6 @@ const unsigned char fpgadata[] =#include "../common/fpga.c" -/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *); - -/* logo bitmap data - gzip compressed and generated by bin2c */ unsigned char logo_bmp_320[] = {
board/esd/pci405/pci405.c +0 -1
@@ -34,7 +34,6 @@DECLARE_GLOBAL_DATA_PTR ;/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *);int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]);unsigned long fpga_done_state (void );unsigned long fpga_init_state (void );
board/esd/plu405/plu405.c +0 -3
@@ -90,9 +90,6 @@ void init_coupler(u32 addr)out_8 (&ctrl->cr,CR_RR ); } -/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *); -int board_early_init_f (void ) {/*
board/esd/tasreg/tasreg.c +0 -1
@@ -29,7 +29,6 @@/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *);int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]);int i2c_write (uchar chip,uint addr,int alen,uchar *buffer,int len);int i2c_read (uchar chip,uint addr,int alen,uchar *buffer,int len);
board/esd/voh405/voh405.c +0 -4
@@ -48,10 +48,6 @@ const unsigned char fpgadata[] =#include "../common/fpga.c" -/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *); - -/* logo bitmap data - gzip compressed and generated by bin2c */ unsigned char logo_bmp_320[] = {
board/esd/wuh405/wuh405.c +0 -4
@@ -46,10 +46,6 @@ const unsigned char fpgadata[] =#include "../common/fpga.c" -/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *); - -int board_early_init_f (void ) {/*
board/mpl/common/common_util.c +0 -1
@@ -48,7 +48,6 @@ DECLARE_GLOBAL_DATA_PTR;#define FIRM_START 0xFFF00000#endif -extern int gunzip (void *,int ,uchar *,unsigned long *);extern int mem_test (ulong start,ulong ramsize,int quiet);#define I2C_BACKUP_ADDR 0x7C00/* 0x200 bytes for backup */
board/prodrive/pdnb3/pdnb3.c +0 -1
@@ -29,7 +29,6 @@DECLARE_GLOBAL_DATA_PTR ;/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *);int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]);/* predefine these here for FPGA programming (before including fpga.c) */
common/cmd_bmp.c +0 -2
@@ -35,8 +35,6 @@static int bmp_info (ulong addr);static int bmp_display (ulong addr,int x,int y); -int gunzip (void *,int ,unsigned char *,unsigned long *); -/* * Allocate and decompress a BMP image using gunzip(). *
common/cmd_bootm.c +0 -1
@@ -59,7 +59,6 @@DECLARE_GLOBAL_DATA_PTR ; -extern int gunzip (void *dst,int dstlen,unsigned char *src,unsigned long *lenp);#ifndef CONFIG_SYS_BOOTM_LEN #define CONFIG_SYS_BOOTM_LEN 0x800000/* use 8MByte as default max gunzip size */ #endif
common/cmd_license.c +0 -1
@@ -29,7 +29,6 @@#include <command.h> #include <malloc.h> #include <license.h> -int gunzip (void *,int ,unsigned char *,unsigned long *);int do_license (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) {
common/cmd_mem.c +0 -2
@@ -1225,8 +1225,6 @@ int do_sha1sum(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])#endif #ifdef CONFIG_CMD_UNZIP -int gunzip (void *,int ,unsigned char *,unsigned long *); -int do_unzip (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) {unsigned long src, dst;
drivers/video/cfb_console.c +0 -2
@@ -401,8 +401,6 @@ static const int video_font_draw_table32[16][4] = { { 0x00ffffff, 0x00ffffff, 0x00ffffff, 0x00ffffff } }; -int gunzip (void *,int ,unsigned char *,unsigned long *); -/******************************************************************************/ static void video_drawchars (int xx,int yy,unsigned char *s,int count)
include/common.h +3 -0
@@ -608,6 +608,9 @@ ulong usec2ticks (unsigned long usec);ulong ticks2usec (unsigned long ticks);int init_timebase (void ); +/* lib_generic/gunzip.c */ +int gunzip (void *,int ,unsigned char *,unsigned long *); +/* lib_generic/vsprintf.c */ ulong simple_strtoul (const char *cp,char **endp,unsigned int base);#ifdef CONFIG_SYS_64BIT_VSPRINTF
lib_generic/gunzip.c +0 -1
@@ -36,7 +36,6 @@#define RESERVED 0xe0#define DEFLATED 8 -int gunzip (void *,int ,unsigned char *,unsigned long *);void *zalloc (void *,unsigned ,unsigned );void zfree (void *,void *,unsigned ); int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
Signature · 1 line
1.5.6.5
PATCH 1/1 move prototype for gunzip() to common.h
Hi,
sorry I did not know where to put additional comments...
I tested this patch for compile-cleanness with a powerpc toolchain (CodeSourcery freescale-4.4-78-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2 to be exact). The warnings and errors were not significantly different with and without this patch - there is no single board in MAKEALL that is compiled without warnings using this toolchain, so it was a bit difficult to compare.
Best regards,
Wolfgang
PATCH 1/1 move prototype for gunzip() to common.h
Dear Wolfgang Wegner,
Quoted 2 lines · In message <[email protected]> you wrote:
sorry I did not know where to put additional comments...
Comments go below the "---" line, i. e.:
... Singed-off-by: Wolfgang Wegner <[email protected]> ---
===>>
Add comments here.
board/bf527-ezkit/video.c | 2 -- board/bf533-stamp/video.c | 2 -- board/bf548-ezkit/video.c | 2 -- ...
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de In a survey taken several years ago, all incoming freshmen at MIT were asked if they expected to graduate in the top half of their class. Ninety-seven percent responded that they did.
PATCH 1/1 move prototype for gunzip() to common.h
Quoted 9 lines · Wolfgang Denk
Dear Wolfgang Wegner,
Quoted 1 line · In message <[email protected]> you wrote:
sorry I did not know where to put additional comments...
Comments go below the "---" line, i. e.:
... Singed-off-by: Wolfgang Wegner <[email protected]>
^^^^^^
...and a typo s/Singed/Signed/
(Singed is what happens to the hair on your hand when the hamburger grease flares up when you flip them. :-)
gvb
[snip]
PATCH 1/1 move prototype for gunzip() to common.h
Quoted 6 lines · Jerry Van Baren
Quoted 5 lines · Wolfgang Denk
Dear Wolfgang Wegner,
Quoted 1 line · In message <[email protected]> you wrote:
sorry I did not know where to put additional comments...
Quoted 7 lines
Quoted 4 lines
Comments go below the "---" line, i. e.:
... Singed-off-by: Wolfgang Wegner <[email protected]>^^^^^^...and a typo s/Singed/Signed/
thank you for comments and corrections, and sorry for initially patching against the wrong code base. Somehow I had messed up what I rememberd about git branching.
Patch is updated and testing in progress - MAKEALL takes some time even here on a reasonable fast machine... In the new version, I also moved the zunzip prototype which seemingly was unused outside of gunzip.c in the master branch but now used in ubifs in next.
Regards,
Wolfgang
PATCH 1/1 move prototype for gunzip() to common.h
In reply to Wolfgang WegnerDear Wolfgang Wegner,
Quoted 22 lines · In message <[email protected]> you wrote:
Prototype for gunzip was only in
lib_generic/gunzip.cand thus repeated in every file using it. This patch moves the prototype tocommon.hand removes all prototypes distributed anywhere else.Singed-off-by Wolfgang Wegner <[email protected]>--- board/bf527-ezkit/video.c | 2 -- board/bf533-stamp/video.c | 2 -- board/bf548-ezkit/video.c | 2 -- board/cm-bf548/video.c | 2 -- board/dave/PPChameleonEVB/PPChameleonEVB.c | 3 --- board/esd/apc405/apc405.c | 3 --- board/esd/ash405/ash405.c | 4 ---- board/esd/cpci405/cpci405.c | 1 - board/esd/hh405/hh405.c | 4 ---- board/esd/pci405/pci405.c | 1 - board/esd/plu405/plu405.c | 3 --- board/esd/tasreg/tasreg.c | 1 - board/esd/voh405/voh405.c | 4 ---- board/esd/wuh405/wuh405.c | 4 ---- board/mpl/common/common_util.c | 1 - board/prodrive/pdnb3/pdnb3.c | 1 -
Quoted 8 lines
common/cmd_bmp.c | 2 -- common/cmd_bootm.c | 1 - common/cmd_license.c | 1 - common/cmd_mem.c | 2 -- drivers/video/cfb_console.c | 2 -- include/common.h | 3 +++ lib_generic/gunzip.c | 1 - 23 files changed, 3 insertions(+), 47 deletions(-)
Hm, this doesn't apply any more:
Applying: move prototype for gunzip() to common.h
error: patch failed: board/esd/plu405/plu405.c:90
error: board/esd/plu405/plu405.c: patch does not apply
error: patch failed: include/common.h:608
error: include/common.h: patch does not apply
Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging board/esd/plu405/plu405.c
CONFLICT (content): Merge conflict in board/esd/plu405/plu405.c Auto-merging common/cmd_bootm.c
Auto-merging drivers/video/cfb_console.c
Auto-merging include/common.h
CONFLICT (content): Merge conflict in include/common.h Failed to merge in the changes.
Patch failed at 0001 move prototype for gunzip() to common.h
Please rebase against the "next" branch and resubmit. Thanks in advance.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The optimum committee has no members.
- Norman AugustinePATCH 1/1 move prototypes for gunzip() and zunzip() to common.h
Prototype for gunzip/zunzip was only in lib_generic/gunzip.c and thus repeated in every file using it. This patch moves the prototypes to common.h and removes all prototypes distributed anywhere else.
---
Tested to be compile-clean for PowerPC using CodeSourcery toolchain freescale-4.4-78-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
board/bf527-ezkit/video.c | 2 -- board/bf533-stamp/video.c | 2 -- board/bf548-ezkit/video.c | 2 -- board/cm-bf548/video.c | 2 -- board/dave/PPChameleonEVB/PPChameleonEVB.c | 3 --- board/esd/apc405/apc405.c | 3 --- board/esd/ash405/ash405.c | 4 ---- board/esd/cpci405/cpci405.c | 1 - board/esd/hh405/hh405.c | 4 ---- board/esd/pci405/pci405.c | 1 - board/esd/plu405/plu405.c | 3 --- board/esd/tasreg/tasreg.c | 1 - board/esd/voh405/voh405.c | 4 ---- board/esd/wuh405/wuh405.c | 4 ---- board/mpl/common/common_util.c | 1 - board/prodrive/pdnb3/pdnb3.c | 1 - common/cmd_bmp.c | 2 -- common/cmd_bootm.c | 1 - common/cmd_license.c | 1 - common/cmd_mem.c | 2 -- drivers/video/cfb_console.c | 2 -- fs/ubifs/ubifs.h | 3 --- include/common.h | 5 +++++ lib_generic/gunzip.c | 3 --- 24 files changed, 5 insertions(+), 52 deletions(-)
board/bf527-ezkit/video.c +0 -2
@@ -16,8 +16,6 @@#include <linux/types.h> #include <stdio_dev.h> -int gunzip (void *,int ,unsigned char *,unsigned long *); -#define DMA_SIZE16 2#include <asm/mach-common/bits/ppi.h>
board/bf533-stamp/video.c +0 -2
@@ -20,8 +20,6 @@#include <linux/types.h> #include <stdio_dev.h> -int gunzip (void *,int ,unsigned char *,unsigned long *); -#define DMA_SIZE16 2#include <asm/mach-common/bits/ppi.h>
board/bf548-ezkit/video.c +0 -2
@@ -16,8 +16,6 @@#include <linux/types.h> #include <stdio_dev.h> -int gunzip (void *,int ,unsigned char *,unsigned long *); -#define DMA_SIZE16 2#include <asm/mach-common/bits/eppi.h>
board/cm-bf548/video.c +0 -2
@@ -16,8 +16,6 @@#include <linux/types.h> #include <stdio_dev.h> -int gunzip (void *,int ,unsigned char *,unsigned long *); -#ifdef CONFIG_VIDEO #define DMA_SIZE16 2
board/dave/PPChameleonEVB/PPChameleonEVB.c +0 -3
@@ -33,9 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;/* ------------------------------------------------------------------------- */ -/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *); -int board_early_init_f (void ) {out32 (GPIO0_OR ,CONFIG_SYS_NAND0_CE );/* set initial outputs */
board/esd/apc405/apc405.c +0 -3
@@ -54,9 +54,6 @@ const unsigned char fpgadata[] =*/ #include "../common/fpga.c" -/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *); -#ifdef CONFIG_LCD_USED /* logo bitmap data - gzip compressed and generated by bin2c */ unsigned char logo_bmp[] =
board/esd/ash405/ash405.c +0 -4
@@ -48,10 +48,6 @@ const unsigned char fpgadata[] =#include "../common/fpga.c" -/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *); - -int board_early_init_f (void ) {/*
board/esd/cpci405/cpci405.c +0 -1
@@ -89,7 +89,6 @@ int N_AU_IMAGES = (sizeof(au_image) / sizeof(au_image[0]));/* Prototypes */ int cpci405_version (void ); -int gunzip (void *,int ,unsigned char *,unsigned long *);void lxt971_no_sleep (void );int board_early_init_f (void )
board/esd/hh405/hh405.c +0 -4
@@ -251,10 +251,6 @@ const unsigned char fpgadata[] =#include "../common/fpga.c" -/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *); - -/* logo bitmap data - gzip compressed and generated by bin2c */ unsigned char logo_bmp_320[] = {
board/esd/pci405/pci405.c +0 -1
@@ -34,7 +34,6 @@DECLARE_GLOBAL_DATA_PTR ;/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *);int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]);unsigned long fpga_done_state (void );unsigned long fpga_init_state (void );
board/esd/plu405/plu405.c +0 -3
@@ -46,9 +46,6 @@ const unsigned char fpgadata[] =*/ #include "../common/fpga.c" -/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *); -int board_early_init_f (void ) {/*
board/esd/tasreg/tasreg.c +0 -1
@@ -29,7 +29,6 @@/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *);int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]);int i2c_write (uchar chip,uint addr,int alen,uchar *buffer,int len);int i2c_read (uchar chip,uint addr,int alen,uchar *buffer,int len);
board/esd/voh405/voh405.c +0 -4
@@ -48,10 +48,6 @@ const unsigned char fpgadata[] =#include "../common/fpga.c" -/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *); - -/* logo bitmap data - gzip compressed and generated by bin2c */ unsigned char logo_bmp_320[] = {
board/esd/wuh405/wuh405.c +0 -4
@@ -46,10 +46,6 @@ const unsigned char fpgadata[] =#include "../common/fpga.c" -/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *); - -int board_early_init_f (void ) {/*
board/mpl/common/common_util.c +0 -1
@@ -48,7 +48,6 @@ DECLARE_GLOBAL_DATA_PTR;#define FIRM_START 0xFFF00000#endif -extern int gunzip (void *,int ,uchar *,unsigned long *);extern int mem_test (ulong start,ulong ramsize,int quiet);#define I2C_BACKUP_ADDR 0x7C00/* 0x200 bytes for backup */
board/prodrive/pdnb3/pdnb3.c +0 -1
@@ -29,7 +29,6 @@DECLARE_GLOBAL_DATA_PTR ;/* Prototypes */ -int gunzip (void *,int ,unsigned char *,unsigned long *);int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]);/* predefine these here for FPGA programming (before including fpga.c) */
common/cmd_bmp.c +0 -2
@@ -35,8 +35,6 @@static int bmp_info (ulong addr);static int bmp_display (ulong addr,int x,int y); -int gunzip (void *,int ,unsigned char *,unsigned long *); -/* * Allocate and decompress a BMP image using gunzip(). *
common/cmd_bootm.c +0 -1
@@ -63,7 +63,6 @@DECLARE_GLOBAL_DATA_PTR ; -extern int gunzip (void *dst,int dstlen,unsigned char *src,unsigned long *lenp);#ifndef CONFIG_SYS_BOOTM_LEN #define CONFIG_SYS_BOOTM_LEN 0x800000/* use 8MByte as default max gunzip size */ #endif
common/cmd_license.c +0 -1
@@ -29,7 +29,6 @@#include <command.h> #include <malloc.h> #include <license.h> -int gunzip (void *,int ,unsigned char *,unsigned long *);int do_license (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) {
common/cmd_mem.c +0 -2
@@ -1225,8 +1225,6 @@ int do_sha1sum(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])#endif #ifdef CONFIG_CMD_UNZIP -int gunzip (void *,int ,unsigned char *,unsigned long *); -int do_unzip (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) {unsigned long src, dst;
drivers/video/cfb_console.c +0 -2
@@ -403,8 +403,6 @@ static const int video_font_draw_table32[16][4] = { { 0x00ffffff, 0x00ffffff, 0x00ffffff, 0x00ffffff } }; -int gunzip (void *,int ,unsigned char *,unsigned long *); -/******************************************************************************/ static void video_drawchars (int xx,int yy,unsigned char *s,int count)
fs/ubifs/ubifs.h +0 -3
@@ -2140,7 +2140,4 @@ int ubifs_decompress(const void *buf, int len, void *out, int *out_len,/* todo: Move these to a common U-Boot header */ int lzo1x_decompress_safe (const unsigned char *in,size_t in_len,unsigned char *out,size_t *out_len); - -int zunzip (void *dst,int dstlen,unsigned char *src,unsigned long *lenp, -int stoponerr,int offset);#endif /* !__UBIFS_H__ */
include/common.h +5 -0
@@ -612,6 +612,11 @@ ulong usec2ticks (unsigned long usec);ulong ticks2usec (unsigned long ticks);int init_timebase (void ); +/* lib_generic/gunzip.c */ +int gunzip (void *,int ,unsigned char *,unsigned long *); +int zunzip (void *dst,int dstlen,unsigned char *src,unsigned long *lenp, +int stoponerr,int offset); +/* lib_generic/time.c */ void udelay (unsigned long );
lib_generic/gunzip.c +0 -3
@@ -36,11 +36,8 @@#define RESERVED 0xe0#define DEFLATED 8 -int gunzip (void *,int ,unsigned char *,unsigned long *);void *zalloc (void *,unsigned ,unsigned );void zfree (void *,void *,unsigned ); -int zunzip (void *dst,int dstlen,unsigned char *src,unsigned long *lenp, -int stoponerr,int offset);void *zalloc (void *x,unsigned items,unsigned size) {
Signature · 1 line
1.5.6.5
Wolfgang Denk
AppliedPATCH 1/1 move prototypes for gunzip() and zunzip() to common.h
Dear Wolfgang Wegner,
Quoted 26 lines · In message <[email protected]> you wrote:
Prototype for gunzip/zunzip was only in
lib_generic/gunzip.cand thus repeated in every file using it. This patch moves the prototypes tocommon.hand removes all prototypes distributed anywhere else.Signed-off-by Wolfgang Wegner <[email protected]>---
Tested to be compile-clean for PowerPC using CodeSourcery toolchain freescale-4.4-78-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2board/bf527-ezkit/video.c | 2 -- board/bf533-stamp/video.c | 2 -- board/bf548-ezkit/video.c | 2 -- board/cm-bf548/video.c | 2 -- board/dave/PPChameleonEVB/PPChameleonEVB.c | 3 --- board/esd/apc405/apc405.c | 3 --- board/esd/ash405/ash405.c | 4 ---- board/esd/cpci405/cpci405.c | 1 - board/esd/hh405/hh405.c | 4 ---- board/esd/pci405/pci405.c | 1 - board/esd/plu405/plu405.c | 3 --- board/esd/tasreg/tasreg.c | 1 - board/esd/voh405/voh405.c | 4 ---- board/esd/wuh405/wuh405.c | 4 ---- board/mpl/common/common_util.c | 1 - board/prodrive/pdnb3/pdnb3.c | 1 - common/cmd_bmp.c | 2 --
Quoted 8 lines
common/cmd_bootm.c | 1 - common/cmd_license.c | 1 - common/cmd_mem.c | 2 -- drivers/video/cfb_console.c | 2 -- fs/ubifs/ubifs.h | 3 --- include/common.h | 5 +++++ lib_generic/gunzip.c | 3 --- 24 files changed, 5 insertions(+), 52 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
It is impractical for the standard to attempt to constrain the
behavior of code that does not obey the constraints of the standard.
- Doug Gwyn