diff options
| -rw-r--r-- | lldb/include/lldb/API/SBFileSpec.h | 2 | ||||
| -rwxr-xr-x | lldb/scripts/Python/build-swig-Python.sh | 1 | ||||
| -rw-r--r-- | lldb/scripts/lldb.swig | 2 | ||||
| -rw-r--r-- | lldb/source/API/SBFileSpec.cpp | 4 | ||||
| -rw-r--r-- | lldb/tools/driver/IOChannel.cpp | 4 |
5 files changed, 8 insertions, 5 deletions
diff --git a/lldb/include/lldb/API/SBFileSpec.h b/lldb/include/lldb/API/SBFileSpec.h index 770ec5bf01e..12644b784f2 100644 --- a/lldb/include/lldb/API/SBFileSpec.h +++ b/lldb/include/lldb/API/SBFileSpec.h @@ -37,7 +37,7 @@ public: Exists () const; const char * - GetFileName() const; + GetFilename() const; const char * GetDirectory() const; diff --git a/lldb/scripts/Python/build-swig-Python.sh b/lldb/scripts/Python/build-swig-Python.sh index de26eccd80e..d04f0eabfa7 100755 --- a/lldb/scripts/Python/build-swig-Python.sh +++ b/lldb/scripts/Python/build-swig-Python.sh @@ -42,6 +42,7 @@ HEADER_FILES="${SRC_ROOT}/include/lldb/lldb-types.h"\ " ${SRC_ROOT}/include/lldb/API/SBDebugger.h"\ " ${SRC_ROOT}/include/lldb/API/SBError.h"\ " ${SRC_ROOT}/include/lldb/API/SBEvent.h"\ +" ${SRC_ROOT}/include/lldb/API/SBFileSpec.h"\ " ${SRC_ROOT}/include/lldb/API/SBFrame.h"\ " ${SRC_ROOT}/include/lldb/API/SBFunction.h"\ " ${SRC_ROOT}/include/lldb/API/SBLineEntry.h"\ diff --git a/lldb/scripts/lldb.swig b/lldb/scripts/lldb.swig index 31dca479704..9c0b9ee5104 100644 --- a/lldb/scripts/lldb.swig +++ b/lldb/scripts/lldb.swig @@ -83,6 +83,7 @@ #include "lldb/API/SBDebugger.h" #include "lldb/API/SBError.h" #include "lldb/API/SBEvent.h" +#include "lldb/API/SBFileSpec.h" #include "lldb/API/SBFrame.h" #include "lldb/API/SBFunction.h" #include "lldb/API/SBLineEntry.h" @@ -136,6 +137,7 @@ typedef int StopReason; %include "lldb/API/SBDebugger.h" %include "lldb/API/SBError.h" %include "lldb/API/SBEvent.h" +%include "lldb/API/SBFileSpec.h" %include "lldb/API/SBFrame.h" %include "lldb/API/SBFunction.h" %include "lldb/API/SBLineEntry.h" diff --git a/lldb/source/API/SBFileSpec.cpp b/lldb/source/API/SBFileSpec.cpp index 308e60975e5..e1a83999f03 100644 --- a/lldb/source/API/SBFileSpec.cpp +++ b/lldb/source/API/SBFileSpec.cpp @@ -24,7 +24,7 @@ SBFileSpec::SBFileSpec (const SBFileSpec &rhs) : m_opaque_ap() { if (rhs.m_opaque_ap.get()) - m_opaque_ap.reset (new FileSpec (*m_opaque_ap)); + m_opaque_ap.reset (new FileSpec (rhs.get())); } SBFileSpec::SBFileSpec (const char *path) : @@ -69,7 +69,7 @@ SBFileSpec::ResolvePath (const char *src_path, char *dst_path, size_t dst_len) } const char * -SBFileSpec::GetFileName() const +SBFileSpec::GetFilename() const { if (m_opaque_ap.get()) return m_opaque_ap->GetFilename().AsCString(); diff --git a/lldb/tools/driver/IOChannel.cpp b/lldb/tools/driver/IOChannel.cpp index a087ab8c656..50fdf730d46 100644 --- a/lldb/tools/driver/IOChannel.cpp +++ b/lldb/tools/driver/IOChannel.cpp @@ -163,7 +163,7 @@ IOChannel::IOChannel m_err_file (err), m_command_queue (), m_completion_key ("\t"), - m_edit_line (::el_init (SBHostOS::GetProgramFileSpec().GetFileName(), in, out, err)), + m_edit_line (::el_init (SBHostOS::GetProgramFileSpec().GetFilename(), in, out, err)), m_history (history_init()), m_history_event(), m_getting_command (false) @@ -213,7 +213,7 @@ IOChannel::HistorySaveLoad (bool save) if (m_history != NULL) { char history_path[PATH_MAX]; - ::snprintf (history_path, sizeof(history_path), "~/.%s-history", SBHostOS::GetProgramFileSpec().GetFileName()); + ::snprintf (history_path, sizeof(history_path), "~/.%s-history", SBHostOS::GetProgramFileSpec().GetFilename()); if ((size_t)SBFileSpec::ResolvePath (history_path, history_path, sizeof(history_path)) < sizeof(history_path) - 1) { const char *path_ptr = history_path; |
