diff options
Diffstat (limited to 'lldb/source/Plugins/ObjectFile')
6 files changed, 18 insertions, 42 deletions
diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp index 4ba081a7b7c..f4af192e38b 100644 --- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp +++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp @@ -160,10 +160,11 @@ ObjectFileELF::Terminate() PluginManager::UnregisterPlugin(CreateInstance); } -const char * +lldb_private::ConstString ObjectFileELF::GetPluginNameStatic() { - return "object-file.elf"; + static ConstString g_name("elf"); + return g_name; } const char * @@ -236,15 +237,9 @@ ObjectFileELF::GetModuleSpecifications (const lldb_private::FileSpec& file, //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ -const char * +lldb_private::ConstString ObjectFileELF::GetPluginName() { - return "ObjectFileELF"; -} - -const char * -ObjectFileELF::GetShortPluginName() -{ return GetPluginNameStatic(); } diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h index 78cfb3f5157..cdf2731b254 100644 --- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h +++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h @@ -38,7 +38,7 @@ public: static void Terminate(); - static const char * + static lldb_private::ConstString GetPluginNameStatic(); static const char * @@ -68,12 +68,9 @@ public: //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ - virtual const char * + virtual lldb_private::ConstString GetPluginName(); - virtual const char * - GetShortPluginName(); - virtual uint32_t GetPluginVersion(); diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index b94ebca297d..7047395bdc7 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -379,10 +379,11 @@ ObjectFileMachO::Terminate() } -const char * +lldb_private::ConstString ObjectFileMachO::GetPluginNameStatic() { - return "object-file.mach-o"; + static ConstString g_name("mach-o"); + return g_name; } const char * @@ -4169,15 +4170,9 @@ ObjectFileMachO::GetLLDBSharedCacheUUID () //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ -const char * +lldb_private::ConstString ObjectFileMachO::GetPluginName() { - return "ObjectFileMachO"; -} - -const char * -ObjectFileMachO::GetShortPluginName() -{ return GetPluginNameStatic(); } diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h index 2226e3dd695..349928e9538 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h @@ -35,7 +35,7 @@ public: static void Terminate(); - static const char * + static lldb_private::ConstString GetPluginNameStatic(); static const char * @@ -122,12 +122,9 @@ public: //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ - virtual const char * + virtual lldb_private::ConstString GetPluginName(); - virtual const char * - GetShortPluginName(); - virtual uint32_t GetPluginVersion(); diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp index 157b148ee5c..b25db97d498 100644 --- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp +++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp @@ -133,10 +133,11 @@ ObjectFilePECOFF::Terminate() } -const char * +lldb_private::ConstString ObjectFilePECOFF::GetPluginNameStatic() { - return "object-file.pe-coff"; + static ConstString g_name("pe-coff"); + return g_name; } const char * @@ -954,15 +955,9 @@ ObjectFilePECOFF::CalculateStrata() //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ -const char * +ConstString ObjectFilePECOFF::GetPluginName() { - return "ObjectFilePECOFF"; -} - -const char * -ObjectFilePECOFF::GetShortPluginName() -{ return GetPluginNameStatic(); } diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h index 33973abad02..d980006eab6 100644 --- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h +++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h @@ -28,7 +28,7 @@ public: static void Terminate(); - static const char * + static lldb_private::ConstString GetPluginNameStatic(); static const char * @@ -106,12 +106,9 @@ public: //------------------------------------------------------------------ // PluginInterface protocol //------------------------------------------------------------------ - virtual const char * + virtual lldb_private::ConstString GetPluginName(); - virtual const char * - GetShortPluginName(); - virtual uint32_t GetPluginVersion(); // |
