Author: jingham
Date: Tue Jul 7 19:59:59 2015
New Revision: 241652
URL: http://llvm.org/viewvc/llvm-project?rev=241652&view=rev
Log:
Make command files specified to the driver actually print their
results if the -Q option is not provided. Also took out the quietly
option from AddInitialCommand, we don't use that to set this option,
we use the override set by the -Q option.
<rdar://problem/21232087>
Modified:
lldb/trunk/tools/driver/Driver.cpp
lldb/trunk/tools/driver/Driver.h
Modified: lldb/trunk/tools/driver/Driver.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Driver.cpp?rev=241652&r1=241651&r2=241652&view=diff
==============================================================================
--- lldb/trunk/tools/driver/Driver.cpp (original)
+++ lldb/trunk/tools/driver/Driver.cpp Tue Jul 7 19:59:59 2015
@@ -452,7 +452,7 @@ Driver::OptionData::Clear ()
}
void
-Driver::OptionData::AddInitialCommand (const char *command, CommandPlacement
placement, bool is_file, bool silent, SBError &error)
+Driver::OptionData::AddInitialCommand (const char *command, CommandPlacement
placement, bool is_file, SBError &error)
{
std::vector<InitialCmdEntry> *command_set;
switch (placement)
@@ -472,18 +472,18 @@ Driver::OptionData::AddInitialCommand (c
{
SBFileSpec file(command);
if (file.Exists())
- command_set->push_back (InitialCmdEntry(command, is_file, silent));
+ command_set->push_back (InitialCmdEntry(command, is_file));
else if (file.ResolveExecutableLocation())
{
char final_path[PATH_MAX];
file.GetPath (final_path, sizeof(final_path));
- command_set->push_back (InitialCmdEntry(final_path, is_file,
silent));
+ command_set->push_back (InitialCmdEntry(final_path, is_file));
}
else
error.SetErrorStringWithFormat("file specified in --source (-s)
option doesn't exist: '%s'", optarg);
}
else
- command_set->push_back (InitialCmdEntry(command, is_file, silent));
+ command_set->push_back (InitialCmdEntry(command, is_file));
}
void
@@ -746,10 +746,10 @@ Driver::ParseArgs (int argc, const char
break;
case 'K':
- m_option_data.AddInitialCommand(optarg,
eCommandPlacementAfterCrash, true, true, error);
+ m_option_data.AddInitialCommand(optarg,
eCommandPlacementAfterCrash, true, error);
break;
case 'k':
- m_option_data.AddInitialCommand(optarg,
eCommandPlacementAfterCrash, false, true, error);
+ m_option_data.AddInitialCommand(optarg,
eCommandPlacementAfterCrash, false, error);
break;
case 'n':
@@ -770,16 +770,16 @@ Driver::ParseArgs (int argc, const char
}
break;
case 's':
- m_option_data.AddInitialCommand(optarg,
eCommandPlacementAfterFile, true, true, error);
+ m_option_data.AddInitialCommand(optarg,
eCommandPlacementAfterFile, true, error);
break;
case 'o':
- m_option_data.AddInitialCommand(optarg,
eCommandPlacementAfterFile, false, true, error);
+ m_option_data.AddInitialCommand(optarg,
eCommandPlacementAfterFile, false, error);
break;
case 'S':
- m_option_data.AddInitialCommand(optarg,
eCommandPlacementBeforeFile, true, true, error);
+ m_option_data.AddInitialCommand(optarg,
eCommandPlacementBeforeFile, true, error);
break;
case 'O':
- m_option_data.AddInitialCommand(optarg,
eCommandPlacementBeforeFile, false, true, error);
+ m_option_data.AddInitialCommand(optarg,
eCommandPlacementBeforeFile, false, error);
break;
default:
m_option_data.m_print_help = true;
Modified: lldb/trunk/tools/driver/Driver.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Driver.h?rev=241652&r1=241651&r2=241652&view=diff
==============================================================================
--- lldb/trunk/tools/driver/Driver.h (original)
+++ lldb/trunk/tools/driver/Driver.h Tue Jul 7 19:59:59 2015
@@ -75,7 +75,7 @@ public:
Clear();
void
- AddInitialCommand (const char *command, CommandPlacement placement,
bool is_file, bool quietly, lldb::SBError &error);
+ AddInitialCommand (const char *command, CommandPlacement placement,
bool is_file, lldb::SBError &error);
//static OptionDefinition m_cmd_option_table[];
_______________________________________________
lldb-commits mailing list
lldb-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
