2 files changed, 7 insertions, 24 deletions
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
index b3647044b27..6999b2a75bf 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
@@ -694,7 +694,7 @@ void
 DisassemblerLLVMC::Initialize()
 {
     PluginManager::RegisterPlugin (GetPluginNameStatic(),
-                                   GetPluginDescriptionStatic(),
+                                   "Disassembler that uses LLVM MC to disassemble i386, x86_64 and ARM.",
                                    CreateInstance);
     
     llvm::InitializeAllTargetInfos();
@@ -710,16 +710,11 @@ DisassemblerLLVMC::Terminate()
 }
 
 
-const char *
+ConstString
 DisassemblerLLVMC::GetPluginNameStatic()
 {
-    return "llvm-mc";
-}
-
-const char *
-DisassemblerLLVMC::GetPluginDescriptionStatic()
-{
-    return "Disassembler that uses LLVM MC to disassemble i386, x86_64 and ARM.";
+    static ConstString g_name("llvm-mc");
+    return g_name;
 }
 
 int DisassemblerLLVMC::OpInfoCallback (void *disassembler,
@@ -813,15 +808,9 @@ const char *DisassemblerLLVMC::SymbolLookup (uint64_t value,
 //------------------------------------------------------------------
 // PluginInterface protocol
 //------------------------------------------------------------------
-const char *
+ConstString
 DisassemblerLLVMC::GetPluginName()
 {
-    return "DisassemblerLLVMC";
-}
-
-const char *
-DisassemblerLLVMC::GetShortPluginName()
-{
     return GetPluginNameStatic();
 }
 
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h
index 4a265c573d8..29b28ade81a 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h
@@ -74,12 +74,9 @@ public:
     static void
     Terminate();
     
-    static const char *
+    static lldb_private::ConstString
     GetPluginNameStatic();
     
-    static const char *
-    GetPluginDescriptionStatic();
-    
     static lldb_private::Disassembler *
     CreateInstance(const lldb_private::ArchSpec &arch, const char *flavor);
         
@@ -99,12 +96,9 @@ public:
     //------------------------------------------------------------------
     // PluginInterface protocol
     //------------------------------------------------------------------
-    virtual const char *
+    virtual lldb_private::ConstString
     GetPluginName();
     
-    virtual const char *
-    GetShortPluginName();
-    
     virtual uint32_t
     GetPluginVersion();