Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make findTrainInfoFileNameLocked return a string instead of a char*."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-21 00:13:57 +00:00
committed by Android (Google) Code Review
parent ec108a95c5 d8c00da9d9
commit d1890075d1
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmds/statsd/src/storage/StorageManager.cpp
View File

@@ -75,11 +75,11 @@ string StorageManager::getDataHistoryFileName(long wallClockSec, int uid, int64_
(long long)id);
}
static const char* findTrainInfoFileNameLocked(const string& trainName) {
static string findTrainInfoFileNameLocked(const string& trainName) {
unique_ptr<DIR, decltype(&closedir)> dir(opendir(TRAIN_INFO_DIR), closedir);
if (dir == NULL) {
VLOG("Path %s does not exist", TRAIN_INFO_DIR);
return nullptr;
return "";
}
dirent* de;
while ((de = readdir(dir.get()))) {
@@ -90,12 +90,12 @@ static const char* findTrainInfoFileNameLocked(const string& trainName) {
if (fileNameLength >= trainName.length()) {
if (0 == strncmp(fileName + fileNameLength - trainName.length(), trainName.c_str(),
trainName.length())) {
return fileName;
return string(fileName);
}
}
}
return nullptr;
return "";
}
// Returns array of int64_t which contains timestamp in seconds, uid,
@@ -267,13 +267,13 @@ bool StorageManager::readTrainInfo(const std::string& trainName, InstallTrainInf
bool StorageManager::readTrainInfoLocked(const std::string& trainName, InstallTrainInfo& trainInfo) {
trimToFit(TRAIN_INFO_DIR, /*parseTimestampOnly=*/ true);
const char* fileName = findTrainInfoFileNameLocked(trainName);
if (fileName == nullptr) {
string fileName = findTrainInfoFileNameLocked(trainName);
if (fileName.empty()) {
return false;
}
int fd = open(StringPrintf("%s/%s", TRAIN_INFO_DIR, fileName).c_str(), O_RDONLY | O_CLOEXEC);
int fd = open(StringPrintf("%s/%s", TRAIN_INFO_DIR, fileName.c_str()).c_str(), O_RDONLY | O_CLOEXEC);
if (fd == -1) {
VLOG("Failed to open %s", fileName);
VLOG("Failed to open %s", fileName.c_str());
return false;
}