Commit 16b9afd2b3548088319a04398dee4c7755e440c3
1 parent
419a1fe954
Exists in
master
and in
54 other branches
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>
Showing 1 changed file with 4 additions and 10 deletions Side-by-side Diff
fs/jffs2/jffs2_1pass.c
... | ... | @@ -696,7 +696,6 @@ |
696 | 696 | u32 latestVersion = 0; |
697 | 697 | uchar *lDest; |
698 | 698 | uchar *src; |
699 | - long ret; | |
700 | 699 | int i; |
701 | 700 | u32 counter = 0; |
702 | 701 | #ifdef CONFIG_SYS_JFFS2_SORT_FRAGMENTS |
703 | 702 | |
704 | 703 | |
705 | 704 | |
706 | 705 | |
707 | 706 | |
... | ... | @@ -768,28 +767,25 @@ |
768 | 767 | #endif |
769 | 768 | switch (jNode->compr) { |
770 | 769 | case JFFS2_COMPR_NONE: |
771 | - ret = (unsigned long) ldr_memcpy(lDest, src, jNode->dsize); | |
770 | + ldr_memcpy(lDest, src, jNode->dsize); | |
772 | 771 | break; |
773 | 772 | case JFFS2_COMPR_ZERO: |
774 | - ret = 0; | |
775 | 773 | for (i = 0; i < jNode->dsize; i++) |
776 | 774 | *(lDest++) = 0; |
777 | 775 | break; |
778 | 776 | case JFFS2_COMPR_RTIME: |
779 | - ret = 0; | |
780 | 777 | rtime_decompress(src, lDest, jNode->csize, jNode->dsize); |
781 | 778 | break; |
782 | 779 | case JFFS2_COMPR_DYNRUBIN: |
783 | 780 | /* this is slow but it works */ |
784 | - ret = 0; | |
785 | 781 | dynrubin_decompress(src, lDest, jNode->csize, jNode->dsize); |
786 | 782 | break; |
787 | 783 | case JFFS2_COMPR_ZLIB: |
788 | - ret = zlib_decompress(src, lDest, jNode->csize, jNode->dsize); | |
784 | + zlib_decompress(src, lDest, jNode->csize, jNode->dsize); | |
789 | 785 | break; |
790 | 786 | #if defined(CONFIG_JFFS2_LZO) |
791 | 787 | case JFFS2_COMPR_LZO: |
792 | - ret = lzo_decompress(src, lDest, jNode->csize, jNode->dsize); | |
788 | + lzo_decompress(src, lDest, jNode->csize, jNode->dsize); | |
793 | 789 | break; |
794 | 790 | #endif |
795 | 791 | default: |
... | ... | @@ -803,7 +799,6 @@ |
803 | 799 | |
804 | 800 | #if 0 |
805 | 801 | putLabeledWord("read_inode: totalSize = ", totalSize); |
806 | - putLabeledWord("read_inode: compr ret = ", ret); | |
807 | 802 | #endif |
808 | 803 | } |
809 | 804 | counter++; |
810 | 805 | |
... | ... | @@ -1575,9 +1570,8 @@ |
1575 | 1570 | |
1576 | 1571 | if (*(uint32_t *)(&buf[ofs-buf_ofs]) == 0xffffffff) { |
1577 | 1572 | uint32_t inbuf_ofs; |
1578 | - uint32_t empty_start, scan_end; | |
1573 | + uint32_t scan_end; | |
1579 | 1574 | |
1580 | - empty_start = ofs; | |
1581 | 1575 | ofs += 4; |
1582 | 1576 | scan_end = min_t(uint32_t, EMPTY_SCAN_SIZE( |
1583 | 1577 | part->sector_size)/8, |