intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-15 20:54:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

[NFC] Small code cleanups in utility.

Browse Source 
Fix a few small annoyances in Utility I ran into.

llvm-svn: 348996
This commit is contained in:
Jonas Devlieghere
2018-12-13 00:15:17 +00:00
parent 96929fdd42
commit 65e5e2781f
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/source/Utility/FileSpec.cpp
View File

@@ -424,7 +424,7 @@ std::string FileSpec::GetPath(bool denormalize) const {
}
const char *FileSpec::GetCString(bool denormalize) const {
return ConstString{GetPath(denormalize)}.AsCString(NULL);
return ConstString{GetPath(denormalize)}.AsCString(nullptr);
}
void FileSpec::GetPath(llvm::SmallVectorImpl<char> &path,

4
lldb/source/Utility/Stream.cpp
View File

@@ -93,9 +93,9 @@ void Stream::QuotedCString(const char *cstr, const char *format) {
//------------------------------------------------------------------
void Stream::Address(uint64_t addr, uint32_t addr_size, const char *prefix,
const char *suffix) {
if (prefix == NULL)
if (prefix == nullptr)
prefix = "";
if (suffix == NULL)
if (suffix == nullptr)
suffix = "";
// int addr_width = m_addr_size << 1;
// Printf ("%s0x%0*" PRIx64 "%s", prefix, addr_width, addr, suffix);

2
lldb/source/Utility/StringList.cpp
View File

@@ -83,7 +83,7 @@ size_t StringList::GetMaxStringLength() const {
const char *StringList::GetStringAtIndex(size_t idx) const {
if (idx < m_strings.size())
return m_strings[idx].c_str();
return NULL;
return nullptr;
}
void StringList::Join(const char *separator, Stream &strm) {

6
lldb/source/Utility/StructuredData.cpp
View File

@@ -144,7 +144,7 @@ static StructuredData::ObjectSP ParseJSONValue(JSONParser &json_parser) {
}
StructuredData::ObjectSP StructuredData::ParseJSON(std::string json_text) {
JSONParser json_parser(json_text.c_str());
JSONParser json_parser(json_text);
StructuredData::ObjectSP object_sp = ParseJSONValue(json_parser);
return object_sp;
}
@@ -169,11 +169,11 @@ StructuredData::Object::GetObjectForDotSeparatedPath(llvm::StringRef path) {
if (this->GetType() == lldb::eStructuredDataTypeArray) {
std::pair<llvm::StringRef, llvm::StringRef> match = path.split('[');
if (match.second.size() == 0) {
if (match.second.empty()) {
return this->shared_from_this();
}
errno = 0;
uint64_t val = strtoul(match.second.str().c_str(), NULL, 10);
uint64_t val = strtoul(match.second.str().c_str(), nullptr, 10);
if (errno == 0) {
return this->GetAsArray()->GetItemAtIndex(val);
}

2
lldb/source/Utility/TildeExpressionResolver.cpp
View File

@@ -59,7 +59,7 @@ bool StandardTildeExpressionResolver::ResolvePartial(StringRef Expr,
struct passwd *user_entry;
Expr = Expr.drop_front();
while ((user_entry = getpwent()) != NULL) {
while ((user_entry = getpwent()) != nullptr) {
StringRef ThisName(user_entry->pw_name);
if (!ThisName.startswith(Expr))
continue;

4
lldb/source/Utility/UUID.cpp
View File

@@ -51,9 +51,7 @@ std::string UUID::GetAsString(llvm::StringRef separator) const {
return result;
}
void UUID::Dump(Stream *s) const {
s->PutCString(GetAsString().c_str());
}
void UUID::Dump(Stream *s) const { s->PutCString(GetAsString()); }
static inline int xdigit_to_int(char ch) {
ch = tolower(ch);