mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-29 16:10:24 +09:00
fs/jffs2/jffs2_1pass.c: fix warning: variable ... set but not used
Fix: jffs2_1pass.c: In function 'jffs2_1pass_read_inode': jffs2_1pass.c:699:7: warning: variable 'ret' set but not used [-Wunused-but-set-variable] jffs2_1pass.c: In function 'jffs2_1pass_build_lists': jffs2_1pass.c:1578:14: warning: variable 'empty_start' set but not used [-Wunused-but-set-variable] Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
parent
419a1fe954
commit
16b9afd2b3
@ -696,7 +696,6 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
|
|||||||
u32 latestVersion = 0;
|
u32 latestVersion = 0;
|
||||||
uchar *lDest;
|
uchar *lDest;
|
||||||
uchar *src;
|
uchar *src;
|
||||||
long ret;
|
|
||||||
int i;
|
int i;
|
||||||
u32 counter = 0;
|
u32 counter = 0;
|
||||||
#ifdef CONFIG_SYS_JFFS2_SORT_FRAGMENTS
|
#ifdef CONFIG_SYS_JFFS2_SORT_FRAGMENTS
|
||||||
@ -768,28 +767,25 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
|
|||||||
#endif
|
#endif
|
||||||
switch (jNode->compr) {
|
switch (jNode->compr) {
|
||||||
case JFFS2_COMPR_NONE:
|
case JFFS2_COMPR_NONE:
|
||||||
ret = (unsigned long) ldr_memcpy(lDest, src, jNode->dsize);
|
ldr_memcpy(lDest, src, jNode->dsize);
|
||||||
break;
|
break;
|
||||||
case JFFS2_COMPR_ZERO:
|
case JFFS2_COMPR_ZERO:
|
||||||
ret = 0;
|
|
||||||
for (i = 0; i < jNode->dsize; i++)
|
for (i = 0; i < jNode->dsize; i++)
|
||||||
*(lDest++) = 0;
|
*(lDest++) = 0;
|
||||||
break;
|
break;
|
||||||
case JFFS2_COMPR_RTIME:
|
case JFFS2_COMPR_RTIME:
|
||||||
ret = 0;
|
|
||||||
rtime_decompress(src, lDest, jNode->csize, jNode->dsize);
|
rtime_decompress(src, lDest, jNode->csize, jNode->dsize);
|
||||||
break;
|
break;
|
||||||
case JFFS2_COMPR_DYNRUBIN:
|
case JFFS2_COMPR_DYNRUBIN:
|
||||||
/* this is slow but it works */
|
/* this is slow but it works */
|
||||||
ret = 0;
|
|
||||||
dynrubin_decompress(src, lDest, jNode->csize, jNode->dsize);
|
dynrubin_decompress(src, lDest, jNode->csize, jNode->dsize);
|
||||||
break;
|
break;
|
||||||
case JFFS2_COMPR_ZLIB:
|
case JFFS2_COMPR_ZLIB:
|
||||||
ret = zlib_decompress(src, lDest, jNode->csize, jNode->dsize);
|
zlib_decompress(src, lDest, jNode->csize, jNode->dsize);
|
||||||
break;
|
break;
|
||||||
#if defined(CONFIG_JFFS2_LZO)
|
#if defined(CONFIG_JFFS2_LZO)
|
||||||
case JFFS2_COMPR_LZO:
|
case JFFS2_COMPR_LZO:
|
||||||
ret = lzo_decompress(src, lDest, jNode->csize, jNode->dsize);
|
lzo_decompress(src, lDest, jNode->csize, jNode->dsize);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
default:
|
default:
|
||||||
@ -803,7 +799,6 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
|
|||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
putLabeledWord("read_inode: totalSize = ", totalSize);
|
putLabeledWord("read_inode: totalSize = ", totalSize);
|
||||||
putLabeledWord("read_inode: compr ret = ", ret);
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
counter++;
|
counter++;
|
||||||
@ -1575,9 +1570,8 @@ jffs2_1pass_build_lists(struct part_info * part)
|
|||||||
|
|
||||||
if (*(uint32_t *)(&buf[ofs-buf_ofs]) == 0xffffffff) {
|
if (*(uint32_t *)(&buf[ofs-buf_ofs]) == 0xffffffff) {
|
||||||
uint32_t inbuf_ofs;
|
uint32_t inbuf_ofs;
|
||||||
uint32_t empty_start, scan_end;
|
uint32_t scan_end;
|
||||||
|
|
||||||
empty_start = ofs;
|
|
||||||
ofs += 4;
|
ofs += 4;
|
||||||
scan_end = min_t(uint32_t, EMPTY_SCAN_SIZE(
|
scan_end = min_t(uint32_t, EMPTY_SCAN_SIZE(
|
||||||
part->sector_size)/8,
|
part->sector_size)/8,
|
||||||
|
Loading…
Reference in New Issue
Block a user