That should have been a separate commit, I was rushing to get the build unbroken.
But this is a good change, we shouldn't silently fail to load the history file, that's pretty confusing. Dumping to the edit line output file is not great but we're not running commands at this point so there's no better way to inform the user this happened. Jim > On May 22, 2019, at 9:39 PM, Davide Italiano <dccitali...@gmail.com> wrote: > >> Modified: lldb/trunk/source/Host/common/Editline.cpp >> URL: >> http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Editline.cpp?rev=361447&r1=361446&r2=361447&view=diff >> ============================================================================== >> --- lldb/trunk/source/Host/common/Editline.cpp (original) >> +++ lldb/trunk/source/Host/common/Editline.cpp Wed May 22 17:12:45 2019 >> @@ -978,7 +978,9 @@ void Editline::ConfigureEditor(bool mult >> TerminalSizeChanged(); >> >> if (m_history_sp && m_history_sp->IsValid()) { >> - m_history_sp->Load(); >> + if (!m_history_sp->Load()) { >> + fputs("Could not load history file\n.", m_output_file); >> + } >> el_wset(m_editline, EL_HIST, history, m_history_sp->GetHistoryPtr()); >> } >> el_set(m_editline, EL_CLIENTDATA, this); >> >> > > Did you mean to commit this part or you just had it lying around? _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
