Merge "Address const issues in preparation for libcxx rebase." am: a4f7dad am: 3cc69fa

am: 8afff3b

* commit '8afff3bfe18320cece8b5601478a34c313a5ad46':
  Address const issues in preparation for libcxx rebase.

Change-Id: Ic64c71deda5f1ca154f2e3fd281500e7142eff6b
gugelfrei
Dan Austin 8 years ago committed by android-build-merger
commit 6a127c09a8

@ -211,7 +211,7 @@ static status_t readMetadata(const std::string& path, std::string& fsType,
for (auto line : output) {
// Extract values from blkid output, if defined
const char* cline = line.c_str();
char* start = strstr(cline, "TYPE=");
const char* start = strstr(cline, "TYPE=");
if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) {
fsType = value;
}

Loading…
Cancel
Save