From 246bdd63b4e5b0ef9853d336b0de61c27b62c386 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 3 May 2020 11:29:23 +0300 Subject: [PATCH] lib/mcconfig/paths.c: cosmetics. Signed-off-by: Andrew Borodin --- lib/mcconfig/paths.c | 65 ++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/lib/mcconfig/paths.c b/lib/mcconfig/paths.c index eaec98272..247c5bb91 100644 --- a/lib/mcconfig/paths.c +++ b/lib/mcconfig/paths.c @@ -63,35 +63,35 @@ static const struct { /* *INDENT-OFF* */ /* config */ - { "ini", &mc_config_str, MC_CONFIG_FILE}, - { "filehighlight.ini", &mc_config_str, MC_FHL_INI_FILE}, - { "hotlist", &mc_config_str, MC_HOTLIST_FILE}, - { "mc.keymap", &mc_config_str, GLOBAL_KEYMAP_FILE}, - { "menu", &mc_config_str, MC_USERMENU_FILE}, - { "cedit" PATH_SEP_STR "Syntax", &mc_config_str, EDIT_HOME_SYNTAX_FILE}, - { "cedit" PATH_SEP_STR "menu", &mc_config_str, EDIT_HOME_MENU}, - { "panels.ini", &mc_config_str, MC_PANELS_FILE}, + { "ini", &mc_config_str, MC_CONFIG_FILE }, + { "filehighlight.ini", &mc_config_str, MC_FHL_INI_FILE }, + { "hotlist", &mc_config_str, MC_HOTLIST_FILE }, + { "mc.keymap", &mc_config_str, GLOBAL_KEYMAP_FILE }, + { "menu", &mc_config_str, MC_USERMENU_FILE }, + { "cedit" PATH_SEP_STR "Syntax", &mc_config_str, EDIT_HOME_SYNTAX_FILE }, + { "cedit" PATH_SEP_STR "menu", &mc_config_str, EDIT_HOME_MENU }, + { "panels.ini", &mc_config_str, MC_PANELS_FILE }, /* User should move this file with applying some changes in file */ - { "", &mc_config_str, MC_FILEBIND_FILE}, + { "", &mc_config_str, MC_FILEBIND_FILE }, /* data */ - { "skins", &mc_data_str, MC_SKINS_SUBDIR}, - { "fish", &mc_data_str, FISH_PREFIX}, - { "ashrc", &mc_data_str, "ashrc"}, - { "bashrc", &mc_data_str, "bashrc"}, - { "inputrc", &mc_data_str, "inputrc"}, - { "extfs.d", &mc_data_str, MC_EXTFS_DIR}, - { "history", &mc_data_str, MC_HISTORY_FILE}, - { "filepos", &mc_data_str, MC_FILEPOS_FILE}, - { "cedit" PATH_SEP_STR "cooledit.clip", &mc_data_str, EDIT_HOME_CLIP_FILE}, - { "", &mc_data_str, MC_MACRO_FILE}, + { "skins", &mc_data_str, MC_SKINS_SUBDIR }, + { "fish", &mc_data_str, FISH_PREFIX }, + { "ashrc", &mc_data_str, "ashrc" }, + { "bashrc", &mc_data_str, "bashrc" }, + { "inputrc", &mc_data_str, "inputrc" }, + { "extfs.d", &mc_data_str, MC_EXTFS_DIR }, + { "history", &mc_data_str, MC_HISTORY_FILE }, + { "filepos", &mc_data_str, MC_FILEPOS_FILE }, + { "cedit" PATH_SEP_STR "cooledit.clip", &mc_data_str, EDIT_HOME_CLIP_FILE }, + { "", &mc_data_str, MC_MACRO_FILE }, /* cache */ - { "log", &mc_cache_str, "mc.log"}, - { "Tree", &mc_cache_str, MC_TREESTORE_FILE}, - { "cedit" PATH_SEP_STR "cooledit.temp", &mc_cache_str, EDIT_HOME_TEMP_FILE}, - { "cedit" PATH_SEP_STR "cooledit.block", &mc_cache_str, EDIT_HOME_BLOCK_FILE}, + { "log", &mc_cache_str, "mc.log" }, + { "Tree", &mc_cache_str, MC_TREESTORE_FILE }, + { "cedit" PATH_SEP_STR "cooledit.temp", &mc_cache_str, EDIT_HOME_TEMP_FILE }, + { "cedit" PATH_SEP_STR "cooledit.block", &mc_cache_str, EDIT_HOME_BLOCK_FILE }, {NULL, NULL, NULL} /* *INDENT-ON* */ @@ -107,18 +107,17 @@ static const struct } mc_config_migrate_rules_fix[] = { /* *INDENT-OFF* */ - { &mc_data_str, MC_USERMENU_FILE, &mc_config_str}, - { &mc_data_str, EDIT_HOME_SYNTAX_FILE, &mc_config_str}, - { &mc_data_str, EDIT_HOME_MENU, &mc_config_str}, - { &mc_data_str, MC_FILEBIND_FILE, &mc_config_str}, + { &mc_data_str, MC_USERMENU_FILE, &mc_config_str }, + { &mc_data_str, MC_FILEBIND_FILE, &mc_config_str }, + { &mc_data_str, EDIT_HOME_SYNTAX_FILE, &mc_config_str }, + { &mc_data_str, EDIT_HOME_MENU, &mc_config_str }, - { &mc_cache_str, MC_HISTORY_FILE, &mc_data_str}, - { &mc_cache_str, MC_FILEPOS_FILE, &mc_data_str}, - { &mc_cache_str, EDIT_HOME_CLIP_FILE, &mc_data_str}, + { &mc_cache_str, MC_PANELS_FILE, &mc_config_str }, + { &mc_cache_str, MC_HISTORY_FILE, &mc_data_str }, + { &mc_cache_str, MC_FILEPOS_FILE, &mc_data_str }, + { &mc_cache_str, EDIT_HOME_CLIP_FILE, &mc_data_str }, - { &mc_cache_str, MC_PANELS_FILE, &mc_config_str}, - - {NULL, NULL, NULL} + { NULL, NULL, NULL } /* *INDENT-ON* */ }; #endif /* MC_HOMEDIR_XDG */