espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 04:34:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fatfs: fix errors for GCC 8 support and some indentation

Browse Source 
components/fatfs/src/ff.c: In function 'f_fdisk':
components/fatfs/src/ff.c:5995:5: error: this 'for' clause does not guard... [-Werror=misleading-indentation]
     for (n = 16; n < 256 && sz_disk / n / cluster_size > 1024; n *= 2) ;
     ^~~
components/fatfs/src/ff.c:5996:2: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'for'
  if (n == 256) n--;
  ^~
This commit is contained in:
Anton Maklakov
2018-05-24 19:29:33 +08:00
committed by bot
parent 2a810a318f
commit 714a9bda92
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
components/fatfs/src/ff.c
View File

@@ -5975,7 +5975,7 @@ FRESULT f_fdisk (
BYTE s_hd, e_hd, *p, *buf = (BYTE*)work; BYTE s_hd, e_hd, *p, *buf = (BYTE*)work;
DSTATUS stat; DSTATUS stat;
DWORD sz_disk, sz_part, s_part; DWORD sz_disk, sz_part, s_part;
DWORD cluster_size = CLUSTER_SIZE; DWORD cluster_size = CLUSTER_SIZE;
FRESULT res; FRESULT res;
@@ -5991,14 +5991,17 @@ FRESULT f_fdisk (
if (!buf) return FR_NOT_ENOUGH_CORE; if (!buf) return FR_NOT_ENOUGH_CORE;
/* Determine the CHS without any consideration of the drive geometry */ /* Determine the CHS without any consideration of the drive geometry */
for (n = 16; n < 256 && sz_disk / n / cluster_size > 1024; n *= 2) ; for (n = 16; n < 256 && sz_disk / n / cluster_size > 1024; n *= 2)
{
;
}
if (n == 256) n--; if (n == 256) n--;
if (sz_disk < SUPPORTED_FLASH_SIZE) { if (sz_disk < SUPPORTED_FLASH_SIZE) {
cluster_size = 1; cluster_size = 1;
n = sz_disk; n = sz_disk;
} }
e_hd = n - 1; e_hd = n - 1;
sz_cyl = cluster_size * n; sz_cyl = cluster_size * n;
tot_cyl = sz_disk / sz_cyl; tot_cyl = sz_disk / sz_cyl;
/* Create partition table */ /* Create partition table */
@@ -6011,7 +6014,7 @@ FRESULT f_fdisk (
sz_part = (DWORD)sz_cyl * p_cyl; sz_part = (DWORD)sz_cyl * p_cyl;
if (i == 0) { /* Exclude first track of cylinder 0 */ if (i == 0) { /* Exclude first track of cylinder 0 */
s_hd = 1; s_hd = 1;
s_part += cluster_size; sz_part -= cluster_size; s_part += cluster_size; sz_part -= cluster_size;
} else { } else {
s_hd = 0; s_hd = 0;
} }