Sync FreeBSD files to Linux equivalents, to reduce noise in diff

- Sort functions in the same order
- Match whitespace
- Remove commetned out code
- Make filename in comments match filename

llvm-svn: 184746
This commit is contained in:
Ed Maste 2013-06-24 15:09:18 +00:00
parent 428a6784b7
commit 5d34af358a
4 changed files with 25 additions and 29 deletions

View File

@ -121,8 +121,8 @@ Host::GetEnvironment (StringList &env)
} }
bool bool
Host::GetOSVersion(uint32_t &major, Host::GetOSVersion(uint32_t &major,
uint32_t &minor, uint32_t &minor,
uint32_t &update) uint32_t &update)
{ {
struct utsname un; struct utsname un;
@ -193,7 +193,7 @@ GetFreeBSDProcessArgs (const ProcessInstanceInfoMatch *match_info_ptr,
{ {
process_info.GetExecutableFile().SetFile(cstr, false); process_info.GetExecutableFile().SetFile(cstr, false);
if (!(match_info_ptr == NULL || if (!(match_info_ptr == NULL ||
NameMatches (process_info.GetExecutableFile().GetFilename().GetCString(), NameMatches (process_info.GetExecutableFile().GetFilename().GetCString(),
match_info_ptr->GetNameMatchType(), match_info_ptr->GetNameMatchType(),
match_info_ptr->GetProcessInfo().GetName()))) match_info_ptr->GetProcessInfo().GetName())))
@ -218,7 +218,7 @@ GetFreeBSDProcessArgs (const ProcessInstanceInfoMatch *match_info_ptr,
return true; return true;
} }
} }
} }
} }
return false; return false;
} }
@ -240,7 +240,7 @@ GetFreeBSDProcessUserAndGroup(ProcessInstanceInfo &process_info)
struct kinfo_proc proc_kinfo; struct kinfo_proc proc_kinfo;
size_t proc_kinfo_size; size_t proc_kinfo_size;
if (process_info.ProcessIDIsValid()) if (process_info.ProcessIDIsValid())
{ {
int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID,
(int)process_info.GetProcessID() }; (int)process_info.GetProcessID() };

View File

@ -1,4 +1,4 @@
##===- source/Plugins/Platform/Linux/Makefile --------------*- Makefile -*-===## ##===- source/Plugins/Platform/FreeBSD/Makefile ------------*- Makefile -*-===##
# #
# The LLVM Compiler Infrastructure # The LLVM Compiler Infrastructure
# #

View File

@ -168,7 +168,7 @@ PlatformFreeBSD::ResolveExecutable (const FileSpec &exe_file,
if (IsHost()) if (IsHost())
{ {
// If we have "ls" as the exe_file, resolve the executable loation based on // If we have "ls" as the exe_file, resolve the executable location based on
// the current path variables // the current path variables
if (!resolved_exe_file.Exists()) if (!resolved_exe_file.Exists())
{ {
@ -179,9 +179,6 @@ PlatformFreeBSD::ResolveExecutable (const FileSpec &exe_file,
if (!resolved_exe_file.Exists()) if (!resolved_exe_file.Exists())
resolved_exe_file.ResolveExecutableLocation (); resolved_exe_file.ResolveExecutableLocation ();
// Resolve any executable within a bundle on MacOSX
//Host::ResolveExecutableInBundle (resolved_exe_file);
if (resolved_exe_file.Exists()) if (resolved_exe_file.Exists())
error.Clear(); error.Clear();
else else

View File

@ -932,25 +932,25 @@ ProcessMonitor::Launch(LaunchArgs *args)
args->m_error.SetErrorToGenericError(); args->m_error.SetErrorToGenericError();
switch (WEXITSTATUS(status)) switch (WEXITSTATUS(status))
{ {
case ePtraceFailed: case ePtraceFailed:
args->m_error.SetErrorString("Child ptrace failed."); args->m_error.SetErrorString("Child ptrace failed.");
break; break;
case eDupStdinFailed: case eDupStdinFailed:
args->m_error.SetErrorString("Child open stdin failed."); args->m_error.SetErrorString("Child open stdin failed.");
break; break;
case eDupStdoutFailed: case eDupStdoutFailed:
args->m_error.SetErrorString("Child open stdout failed."); args->m_error.SetErrorString("Child open stdout failed.");
break; break;
case eDupStderrFailed: case eDupStderrFailed:
args->m_error.SetErrorString("Child open stderr failed."); args->m_error.SetErrorString("Child open stderr failed.");
break; break;
case eChdirFailed: case eChdirFailed:
args->m_error.SetErrorString("Child failed to set working directory."); args->m_error.SetErrorString("Child failed to set working directory.");
break; break;
case eExecFailed: case eExecFailed:
args->m_error.SetErrorString("Child exec failed."); args->m_error.SetErrorString("Child exec failed.");
break; break;
default: default:
args->m_error.SetErrorString("Child returned unknown exit status."); args->m_error.SetErrorString("Child returned unknown exit status.");
break; break;
} }
@ -1457,19 +1457,6 @@ ProcessMonitor::WriteRegisterValue(lldb::tid_t tid, unsigned offset,
return result; return result;
} }
bool
ProcessMonitor::ReadRegisterSet(lldb::tid_t tid, void *buf, size_t buf_size, unsigned int regset)
{
return false;
}
bool
ProcessMonitor::WriteRegisterSet(lldb::tid_t tid, void *buf, size_t buf_size, unsigned int regset)
{
return false;
}
bool bool
ProcessMonitor::ReadGPR(lldb::tid_t tid, void *buf, size_t buf_size) ProcessMonitor::ReadGPR(lldb::tid_t tid, void *buf, size_t buf_size)
{ {
@ -1488,6 +1475,12 @@ ProcessMonitor::ReadFPR(lldb::tid_t tid, void *buf, size_t buf_size)
return result; return result;
} }
bool
ProcessMonitor::ReadRegisterSet(lldb::tid_t tid, void *buf, size_t buf_size, unsigned int regset)
{
return false;
}
bool bool
ProcessMonitor::WriteGPR(lldb::tid_t tid, void *buf, size_t buf_size) ProcessMonitor::WriteGPR(lldb::tid_t tid, void *buf, size_t buf_size)
{ {
@ -1506,6 +1499,12 @@ ProcessMonitor::WriteFPR(lldb::tid_t tid, void *buf, size_t buf_size)
return result; return result;
} }
bool
ProcessMonitor::WriteRegisterSet(lldb::tid_t tid, void *buf, size_t buf_size, unsigned int regset)
{
return false;
}
bool bool
ProcessMonitor::Resume(lldb::tid_t tid, uint32_t signo) ProcessMonitor::Resume(lldb::tid_t tid, uint32_t signo)
{ {