woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mnt: simplify debug message #2

Browse Source
This commit is contained in:
Robert Swiecki 2018-10-30 01:44:08 +01:00
parent 28c80845ea
commit 122f251efd
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mnt.cc
View File

@ -90,16 +90,16 @@ static const std::string flagsToStr(uintptr_t flags) {
uintptr_t knownFlagMask = 0U; uintptr_t knownFlagMask = 0U;
for (const auto& i : mountFlags) { for (const auto& i : mountFlags) {
if (flags & i.flag) { if (flags & i.flag) {
if (!res.empty()) {
res.append("|");
}
res.append(i.name); res.append(i.name);
res.append("|");
} }
knownFlagMask |= i.flag; knownFlagMask |= i.flag;
} }
if (((flags & ~(knownFlagMask)) == 0) && !res.empty()) { if (flags & ~(knownFlagMask)) {
res.pop_back(); util::StrAppend(&res, "|%#tx", flags & ~(knownFlagMask));
} else {
util::StrAppend(&res, "%#tx", flags & ~(knownFlagMask));
} }
return res; return res;
@ -543,9 +543,9 @@ const std::string describeMountPt(const mount_t& mpt) {
.append(mpt.src.empty() ? "" : mpt.src) .append(mpt.src.empty() ? "" : mpt.src)
.append(mpt.src.empty() ? "" : "' -> '") .append(mpt.src.empty() ? "" : "' -> '")
.append(mpt.dst) .append(mpt.dst)
.append("' flags:'") .append("' flags:")
.append(flagsToStr(mpt.flags)) .append(flagsToStr(mpt.flags))
.append("' type:'") .append(" type:'")
.append(mpt.fs_type) .append(mpt.fs_type)
.append("' options:'") .append("' options:'")
.append(mpt.options) .append(mpt.options)