From a56f1ca1ed63b93eb61fd5319f47347b3eb1e364 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sat, 17 Aug 2013 12:18:22 -0400 Subject: Cleanup MV/MD macros a little. When using variadic macros there's no need for IF_MD2/IF_MV2 to deal with function parameters. IF_MD/IF_MV are enough. Throw in IF_MD_DRV/ID_MV_VOL that return the parameter if MD/MV, or 0 if not. Change-Id: I7605e6039f3be19cb47110c84dcb3c5516f2c3eb --- apps/debug_menu.c | 4 ++-- apps/menus/main_menu.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'apps') diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 265d8988b5..bd8406cacb 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -1424,7 +1424,7 @@ static int disk_callback(int btn, struct gui_synclist *lists) simplelist_addline( "Size: %s", buf); unsigned long free; - fat_size( IF_MV2(0,) NULL, &free ); + fat_size( IF_MV(0,) NULL, &free ); simplelist_addline( "Free: %ld MB", free / 1024); simplelist_addline( @@ -1543,7 +1543,7 @@ static int disk_callback(int btn, struct gui_synclist *lists) simplelist_addline( "Size: %ld MB", info.num_sectors*(info.sector_size/512)/2024); unsigned long free; - fat_size( IF_MV2(0,) NULL, &free ); + fat_size( IF_MV(0,) NULL, &free ); simplelist_addline( "Free: %ld MB", free / 1024); simplelist_addline( diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index f4b754364b..8445d67035 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -160,7 +160,7 @@ static const char* info_getname(int selected_item, void *data, #endif if (info->new_data) { - fat_size(IF_MV2(0,) &info->size, &info->free); + fat_size(IF_MV(0,) &info->size, &info->free); #ifdef HAVE_MULTIVOLUME if (fat_ismounted(1)) fat_size(1, &info->size2, &info->free2); -- cgit v1.2.3