diff options
Diffstat (limited to 'lldb/source/Plugins/ObjectContainer/BSD-Archive')
| -rw-r--r-- | lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp | 14 | ||||
| -rw-r--r-- | lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp index 97aed1a323b..d61a88b51af 100644 --- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp +++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp @@ -49,8 +49,8 @@ ObjectContainerBSDArchive::Object::Clear() ar_file_size = 0; } -uint32_t -ObjectContainerBSDArchive::Object::Extract (const DataExtractor& data, uint32_t offset) +lldb::offset_t +ObjectContainerBSDArchive::Object::Extract (const DataExtractor& data, lldb::offset_t offset) { size_t ar_name_len = 0; std::string str; @@ -98,7 +98,7 @@ ObjectContainerBSDArchive::Object::Extract (const DataExtractor& data, uint32_t ar_file_size = ar_size - ar_name_len; return offset; } - return LLDB_INVALID_INDEX32; + return LLDB_INVALID_OFFSET; } ObjectContainerBSDArchive::Archive::Archive @@ -120,7 +120,7 @@ size_t ObjectContainerBSDArchive::Archive::ParseObjects (DataExtractor &data) { std::string str; - uint32_t offset = 0; + lldb::offset_t offset = 0; str.assign((const char *)data.GetData(&offset, SARMAG), SARMAG); if (str == ARMAG) { @@ -128,9 +128,9 @@ ObjectContainerBSDArchive::Archive::ParseObjects (DataExtractor &data) do { offset = obj.Extract (data, offset); - if (offset == LLDB_INVALID_INDEX32) + if (offset == LLDB_INVALID_OFFSET) break; - uint32_t obj_idx = m_objects.size(); + size_t obj_idx = m_objects.size(); m_objects.push_back(obj); // Insert all of the C strings out of order for now... m_object_name_to_index_map.Append (obj.ar_name.GetCString(), obj_idx); @@ -147,7 +147,7 @@ ObjectContainerBSDArchive::Archive::ParseObjects (DataExtractor &data) ObjectContainerBSDArchive::Object * ObjectContainerBSDArchive::Archive::FindObject (const ConstString &object_name) { - const UniqueCStringMap<uint32_t>::Entry *match = m_object_name_to_index_map.FindFirstValueForName (object_name.GetCString()); + const ObjectNameToIndexMap::Entry *match = m_object_name_to_index_map.FindFirstValueForName (object_name.GetCString()); if (match) return &m_objects[match->value]; return NULL; diff --git a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h index ce245b1f54b..22779a1848a 100644 --- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h +++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h @@ -97,8 +97,8 @@ protected: void Clear(); - uint32_t - Extract (const lldb_private::DataExtractor& data, uint32_t offset); + lldb::offset_t + Extract (const lldb_private::DataExtractor& data, lldb::offset_t offset); lldb_private::ConstString ar_name; // name uint32_t ar_date; // modification time @@ -106,8 +106,8 @@ protected: uint16_t ar_gid; // group id uint16_t ar_mode; // octal file permissions uint32_t ar_size; // size in bytes - uint32_t ar_file_offset; // file offset in bytes from the beginning of the file of the object data - uint32_t ar_file_size; // length of the object data + lldb::offset_t ar_file_offset; // file offset in bytes from the beginning of the file of the object data + lldb::offset_t ar_file_size; // length of the object data typedef std::vector<Object> collection; typedef collection::iterator iterator; @@ -170,14 +170,14 @@ protected: HasNoExternalReferences() const; protected: - + typedef lldb_private::UniqueCStringMap<uint32_t> ObjectNameToIndexMap; //---------------------------------------------------------------------- // Member Variables //---------------------------------------------------------------------- lldb_private::ArchSpec m_arch; lldb_private::TimeValue m_time; Object::collection m_objects; - lldb_private::UniqueCStringMap<uint32_t> m_object_name_to_index_map; + ObjectNameToIndexMap m_object_name_to_index_map; }; void |
