提交 48a6916d authored 作者: Jeremiah Gowdy's avatar Jeremiah Gowdy

Fix FS-11611 by commenting locals which are unused if configured with…

Fix FS-11611 by commenting locals which are unused if configured with --disable-core-libedit-support
上级 6ac81059
...@@ -1420,8 +1420,10 @@ int main(int argc, char *argv[]) ...@@ -1420,8 +1420,10 @@ int main(int argc, char *argv[])
const char *line = NULL; const char *line = NULL;
char cmd_str[2048] = ""; char cmd_str[2048] = "";
cli_profile_t *profile = NULL; cli_profile_t *profile = NULL;
#ifdef HAVE_LIBEDIT
int argv_use_history_file = 1; int argv_use_history_file = 1;
int use_history_file = 0; int use_history_file = 0;
#endif
#ifndef WIN32 #ifndef WIN32
char hfile[512] = "/tmp/fs_cli_history"; char hfile[512] = "/tmp/fs_cli_history";
char cfile[512] = "/etc/fs_cli.conf"; char cfile[512] = "/etc/fs_cli.conf";
...@@ -1581,7 +1583,9 @@ int main(int argc, char *argv[]) ...@@ -1581,7 +1583,9 @@ int main(int argc, char *argv[])
argv_batch = 1; argv_batch = 1;
break; break;
case 'Q': case 'Q':
#ifdef HAVE_LIBEDIT
argv_use_history_file = 0; argv_use_history_file = 0;
#endif
break; break;
case 'i': case 'i':
allow_ctl_c = 1; allow_ctl_c = 1;
...@@ -1645,9 +1649,11 @@ int main(int argc, char *argv[]) ...@@ -1645,9 +1649,11 @@ int main(int argc, char *argv[])
profile->batch_mode = 1; profile->batch_mode = 1;
feature_level=0; feature_level=0;
} }
#ifdef HAVE_LIBEDIT
if (argv_use_history_file && profile->use_history_file) { if (argv_use_history_file && profile->use_history_file) {
use_history_file = 1; use_history_file = 1;
} }
#endif
if (*argv_loglevel) { if (*argv_loglevel) {
esl_set_string(profile->loglevel, argv_loglevel); esl_set_string(profile->loglevel, argv_loglevel);
profile->quiet = 0; profile->quiet = 0;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论