[Lldb-commits] [lldb] r154572 - in /lldb/branches/lldb-platform-work: include/lldb/Target/Platform.h source/Plugins/Platform/MacOSX/PlatformDarwin.cpp source/Plugins/Platform/POSIX/PlatformPOSIX.cpp source/Plugins/Platform/POSIX/PlatformPOSIX.h source/Target/Platform.cpp
Johnny Chen
johnny.chen at apple.com
Wed Apr 11 17:49:34 PDT 2012
Author: johnny
Date: Wed Apr 11 19:49:34 2012
New Revision: 154572
URL: http://llvm.org/viewvc/llvm-project?rev=154572&view=rev
Log:
Renaming from Platform::GetRSyncArgs() to GetRSyncOpts(), similarly for GetSSHArgs() to GetSSHOpts().
Modified:
lldb/branches/lldb-platform-work/include/lldb/Target/Platform.h
lldb/branches/lldb-platform-work/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
lldb/branches/lldb-platform-work/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
lldb/branches/lldb-platform-work/source/Plugins/Platform/POSIX/PlatformPOSIX.h
lldb/branches/lldb-platform-work/source/Target/Platform.cpp
Modified: lldb/branches/lldb-platform-work/include/lldb/Target/Platform.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/include/lldb/Target/Platform.h?rev=154572&r1=154571&r2=154572&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/include/lldb/Target/Platform.h (original)
+++ lldb/branches/lldb-platform-work/include/lldb/Target/Platform.h Wed Apr 11 19:49:34 2012
@@ -520,15 +520,15 @@
}
virtual const char*
- GetRSyncArgs ()
+ GetRSyncOpts ()
{
- return m_rsync_args.c_str();
+ return m_rsync_opts.c_str();
}
virtual void
- SetRSyncArgs (const char* args)
+ SetRSyncOpts (const char* opts)
{
- m_rsync_args.assign(args);
+ m_rsync_opts.assign(opts);
}
virtual bool
@@ -544,15 +544,15 @@
}
virtual const char*
- GetSSHArgs ()
+ GetSSHOpts ()
{
- return m_ssh_args.c_str();
+ return m_ssh_opts.c_str();
}
virtual void
- SetSSHArgs (const char* args)
+ SetSSHOpts (const char* opts)
{
- m_ssh_args.assign(args);
+ m_ssh_opts.assign(opts);
}
virtual Options *
@@ -586,9 +586,9 @@
uint32_t m_max_uid_name_len;
uint32_t m_max_gid_name_len;
bool m_supports_rsync;
- std::string m_rsync_args;
+ std::string m_rsync_opts;
bool m_supports_ssh;
- std::string m_ssh_args;
+ std::string m_ssh_opts;
const char *
GetCachedUserName (uint32_t uid)
Modified: lldb/branches/lldb-platform-work/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp?rev=154572&r1=154571&r2=154572&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp (original)
+++ lldb/branches/lldb-platform-work/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp Wed Apr 11 19:49:34 2012
@@ -404,12 +404,12 @@
if (posix_options->m_rsync)
{
SetSupportsRSync(true);
- SetRSyncArgs(posix_options->m_rsync_args.c_str());
+ SetRSyncOpts(posix_options->m_rsync_opts.c_str());
}
if (posix_options->m_ssh)
{
SetSupportsSSH(true);
- SetSSHArgs(posix_options->m_ssh_args.c_str());
+ SetSSHOpts(posix_options->m_ssh_opts.c_str());
}
}
}
Modified: lldb/branches/lldb-platform-work/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp?rev=154572&r1=154571&r2=154572&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp (original)
+++ lldb/branches/lldb-platform-work/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp Wed Apr 11 19:49:34 2012
@@ -45,7 +45,9 @@
PlatformPOSIX::POSIXPlatformConnectionOptions::POSIXPlatformConnectionOptions (CommandInterpreter &interpreter) :
Options (interpreter),
m_rsync (false),
-m_rsync_args()
+m_rsync_opts (),
+m_ssh (false),
+m_ssh_opts ()
{
}
@@ -66,7 +68,7 @@
break;
case 'R':
- m_rsync_args.assign(option_arg);
+ m_rsync_opts.assign(option_arg);
break;
case 's':
@@ -74,7 +76,7 @@
break;
case 'S':
- m_ssh_args.assign(option_arg);
+ m_ssh_opts.assign(option_arg);
break;
default:
@@ -89,7 +91,9 @@
PlatformPOSIX::POSIXPlatformConnectionOptions::OptionParsingStarting ()
{
m_rsync = false;
- m_rsync_args.clear();
+ m_rsync_opts.clear();
+ m_ssh = false;
+ m_ssh_opts.clear();
}
const OptionDefinition*
@@ -130,7 +134,7 @@
// run the command over SSH
StreamString command;
command.Printf("ssh %s %s %s",
- GetSSHArgs(),
+ GetSSHOpts(),
GetHostname(),
command_line.c_str());
return m_remote_platform_sp->RunShellCommand(command.GetData());
@@ -272,7 +276,7 @@
return Error("unable to get file path for destination");
StreamString command;
command.Printf("rsync %s %s %s:%s",
- GetRSyncArgs(),
+ GetRSyncOpts(),
src_path.c_str(),
GetHostname(),
dst_path.c_str());
@@ -363,7 +367,7 @@
{
StreamString command;
command.Printf("rsync %s %s:%s %s",
- GetRSyncArgs(),
+ GetRSyncOpts(),
GetHostname(),
src_path.c_str(),
dst_path.c_str());
Modified: lldb/branches/lldb-platform-work/source/Plugins/Platform/POSIX/PlatformPOSIX.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Plugins/Platform/POSIX/PlatformPOSIX.h?rev=154572&r1=154571&r2=154572&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Plugins/Platform/POSIX/PlatformPOSIX.h (original)
+++ lldb/branches/lldb-platform-work/source/Plugins/Platform/POSIX/PlatformPOSIX.h Wed Apr 11 19:49:34 2012
@@ -97,9 +97,9 @@
// Instance variables to hold the values for command options.
bool m_rsync;
- std::string m_rsync_args;
+ std::string m_rsync_opts;
bool m_ssh;
- std::string m_ssh_args;
+ std::string m_ssh_opts;
};
lldb::PlatformSP m_remote_platform_sp; // Allow multiple ways to connect to a remote POSIX-compliant OS
Modified: lldb/branches/lldb-platform-work/source/Target/Platform.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Target/Platform.cpp?rev=154572&r1=154571&r2=154572&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Target/Platform.cpp (original)
+++ lldb/branches/lldb-platform-work/source/Target/Platform.cpp Wed Apr 11 19:49:34 2012
@@ -190,9 +190,9 @@
m_max_uid_name_len (0),
m_max_gid_name_len (0),
m_supports_rsync (false),
- m_rsync_args (),
+ m_rsync_opts (),
m_supports_ssh (false),
- m_ssh_args ()
+ m_ssh_opts ()
{
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT));
if (log)
More information about the lldb-commits
mailing list