← Back to branch summary

~ubuntu-branches/ubuntu/trusty/llvm-toolchain-snapshot/trusty-201310232150

« back to all changes in this revision

Viewing changes to lldb/source/Host/macosx/Symbols.cpp

  • Committer: Package Import Robot
  • Author(s): Sylvestre Ledru
  • Date: 2013-05-27 15:01:57 UTC
  • mfrom: (0.10.1) (0.9.1) (0.8.1) (0.7.1) (0.6.1) (0.5.2)
  • Revision ID: package-import@ubuntu.com-20130527150157-tdkrsjpuvht7v0qx
Tags: 1:3.4~svn182733-1~exp1
http://bugs.debian.org/708677
* New snapshot release (3.4 release)
* Add a symlink of libLLVM-3.4.so.1 to usr/lib/llvm-3.4/lib/libLLVM-3.4.so
    to fix make the llvm-config-3.4 --libdir work (Closes: #708677)
  * Various packages rename to allow co installations:
    * libclang1 => libclang1-3.4
    * libclang1-dbg => libclang1-3.4-dbg
    * libclang-dev => libclang-3.4-dev
    * libclang-common-dev => libclang-common-3.4-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
lldb/source/Host/macosx/Symbols.cpp
364
364
                    CFDictionaryRef uuid_dict = NULL;
365
365
                    if (dict.get())
366
366
                    {
367
 
                        char uuid_cstr_buf[64];
368
 
                        const char *uuid_cstr = uuid->GetAsCString (uuid_cstr_buf, sizeof(uuid_cstr_buf));
369
 
                        CFCString uuid_cfstr (uuid_cstr);
 
367
                        CFCString uuid_cfstr (uuid->GetAsString().c_str());
370
368
                        uuid_dict = static_cast<CFDictionaryRef>(::CFDictionaryGetValue (dict.get(), uuid_cfstr.get()));
371
369
                        if (uuid_dict)
372
370
                        {
719
717
        }
720
718
        if (g_dsym_for_uuid_exe_exists)
721
719
        {
722
 
            char uuid_cstr_buffer[64];
 
720
            std::string uuid_str;
723
721
            char file_path[PATH_MAX];
724
 
            uuid_cstr_buffer[0] = '\0';
725
722
            file_path[0] = '\0';
726
 
            const char *uuid_cstr = NULL;
727
723
 
728
724
            if (uuid_ptr)
729
 
                uuid_cstr = uuid_ptr->GetAsCString(uuid_cstr_buffer, sizeof(uuid_cstr_buffer));
 
725
                uuid_str = uuid_ptr->GetAsString();
730
726
 
731
727
            if (file_spec_ptr)
732
728
                file_spec_ptr->GetPath(file_path, sizeof(file_path));
733
729
            
734
730
            StreamString command;
735
 
            if (uuid_cstr)
736
 
                command.Printf("%s --ignoreNegativeCache --copyExecutable %s", g_dsym_for_uuid_exe_path, uuid_cstr);
 
731
            if (!uuid_str.empty())
 
732
                command.Printf("%s --ignoreNegativeCache --copyExecutable %s", g_dsym_for_uuid_exe_path, uuid_str.c_str());
737
733
            else if (file_path && file_path[0])
738
734
                command.Printf("%s --ignoreNegativeCache --copyExecutable %s", g_dsym_for_uuid_exe_path, file_path);
739
735
            
760
756
                    
761
757
                    if (plist.get() && CFGetTypeID (plist.get()) == CFDictionaryGetTypeID ())
762
758
                    {
763
 
                        if (uuid_cstr)
 
759
                        if (!uuid_str.empty())
764
760
                        {
765
 
                            CFCString uuid_cfstr(uuid_cstr);
 
761
                            CFCString uuid_cfstr(uuid_str.c_str());
766
762
                            CFDictionaryRef uuid_dict = (CFDictionaryRef)CFDictionaryGetValue (plist.get(), uuid_cfstr.get());
767
763
                            success = GetModuleSpecInfoFromUUIDDictionary (uuid_dict, module_spec);
768
764
                        }