Commit 16b9afd2b3548088319a04398dee4c7755e440c3

Authored by Wolfgang Denk
1 parent 419a1fe954
Exists in master and in 55 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

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,