summaryrefslogtreecommitdiffstats
path: root/lldb/tools/driver/Driver.cpp
diff options
context:
space:
mode:
authorJim Ingham <jingham@apple.com>2015-07-08 00:59:59 +0000
committerJim Ingham <jingham@apple.com>2015-07-08 00:59:59 +0000
commit22302e5995544ceda622c939fb26a5f9f361d012 (patch)
treee9f88ead7a697e9cae760db45aaa7c3b224f38af /lldb/tools/driver/Driver.cpp
parent007135e612e5dd2b9d9f22d777efda6d1c1b6010 (diff)
downloadbcm5719-llvm-22302e5995544ceda622c939fb26a5f9f361d012.tar.gz
bcm5719-llvm-22302e5995544ceda622c939fb26a5f9f361d012.zip
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> llvm-svn: 241652
Diffstat (limited to 'lldb/tools/driver/Driver.cpp')
-rw-r--r--lldb/tools/driver/Driver.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/lldb/tools/driver/Driver.cpp b/lldb/tools/driver/Driver.cpp
index 91b92d25f43..3b2eadd836b 100644
--- a/lldb/tools/driver/Driver.cpp
+++ b/lldb/tools/driver/Driver.cpp
@@ -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 (const char *command, CommandPlacement pla
{
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 *argv[], FILE *out_fh, bool &exiting)
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 *argv[], FILE *out_fh, bool &exiting)
}
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;
OpenPOWER on IntegriCloud