Hopfully fix up the remaining warnings

Change-Id: Iba1facabf4980b491d80842ef91e92d6bc374cfa
This commit is contained in:
Solomon Peachy 2024-11-23 22:38:42 -05:00
parent 1bf19eaaff
commit fb2316b9b0

View file

@ -172,8 +172,9 @@ static int refresh_data(struct info_data *info)
int special = 0; int special = 0;
#endif #endif
int drive = 0; int drive = 0;
for (i = 0 ; CHECK_VOL(i) ; i++) { for (i = 0 ; CHECK_VOL(i) ; i++)
#endif #endif
{
volume_size(IF_MV(i,) &info->size[i], &info->free[i]); volume_size(IF_MV(i,) &info->size[i], &info->free[i]);
#ifdef HAVE_MULTIVOLUME #ifdef HAVE_MULTIVOLUME
#ifdef HAVE_MULTIDRIVE #ifdef HAVE_MULTIDRIVE
@ -194,8 +195,10 @@ static int refresh_data(struct info_data *info)
special = 1; special = 1;
} }
#endif #endif
#if defined(HAVE_MULTIVOLUME) && (defined(HAVE_HOTSWAP) || defined(HAVE_HOTSWAP) || defined(HAVE_DIRCACHE) || defined(HAVE_BOOTDATA)) #if defined(HAVE_MULTIVOLUME) && (defined(HAVE_HOTSWAP) || defined(HAVE_DIRCACHE) || defined(HAVE_BOOTDATA)) // Is this #ifdef necessary?
if (volume_partition(i) == -1) { if (volume_partition(i) == -1)
#endif
{
#ifdef HAVE_MULTIDRIVE #ifdef HAVE_MULTIDRIVE
if (special) if (special)
info->name[i] = LANG_DISK_NAME_MMC; info->name[i] = LANG_DISK_NAME_MMC;
@ -204,13 +207,10 @@ static int refresh_data(struct info_data *info)
info->name[i] = 0; info->name[i] = 0;
break; /* ie stop when we run out of valid partitions */ break; /* ie stop when we run out of valid partitions */
} }
#endif
#ifdef HAVE_MULTIDRIVE #ifdef HAVE_MULTIDRIVE
} }
#endif #endif
#ifdef HAVE_MULTIVOLUME
} }
#endif
info->new_data = false; info->new_data = false;
return i; return i;