Skip to content

Commit 0d1e95d

Browse files
committed
COMMON: Fix formatting
1 parent 1c0fece commit 0d1e95d

File tree

1 file changed

+28
-23
lines changed

1 file changed

+28
-23
lines changed

common/VirtualIdentity.cc

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,25 @@
2828
#include <cstring>
2929
#include <pwd.h>
3030

31-
namespace {
32-
//! Method to get the uid/gid values for user 'nobody'
33-
std::pair<uid_t, gid_t> GetNobodyUidGid() {
34-
struct passwd pw_info;
35-
memset(&pw_info, 0, sizeof(pw_info));
36-
char buffer[131072];
37-
size_t buflen = sizeof(buffer);
38-
struct passwd* pw_prt = 0;
39-
const std::string name = "nobody";
40-
41-
if (getpwnam_r(name.c_str(), &pw_info, buffer, buflen, &pw_prt) ||
42-
(!pw_prt)) {
43-
std::terminate();
44-
}
45-
46-
return std::make_pair(pw_info.pw_uid, pw_info.pw_gid);
47-
};
31+
namespace
32+
{
33+
//! Method to get the uid/gid values for user 'nobody'
34+
std::pair<uid_t, gid_t> GetNobodyUidGid()
35+
{
36+
struct passwd pw_info;
37+
memset(&pw_info, 0, sizeof(pw_info));
38+
char buffer[131072];
39+
size_t buflen = sizeof(buffer);
40+
struct passwd* pw_prt = 0;
41+
const std::string name = "nobody";
42+
43+
if (getpwnam_r(name.c_str(), &pw_info, buffer, buflen, &pw_prt) ||
44+
(!pw_prt)) {
45+
std::terminate();
46+
}
47+
48+
return std::make_pair(pw_info.pw_uid, pw_info.pw_gid);
49+
};
4850
}
4951

5052

@@ -139,16 +141,19 @@ VirtualIdentity::getTrace(bool compact) const
139141
{
140142
std::stringstream ss;
141143
time_t now = time(NULL);
144+
142145
if (compact) {
143-
ss << "{uid:" << uid << ",gid:" << gid << ",tident:" << tident << ",prot:" << prot << ",app:" << app << ",host:" << host << ",domain:" << domain << "trace:" << trace << ",onbehalf:"<<onbehalf<<"}";
146+
ss << "{uid:" << uid << ",gid:" << gid << ",tident:" << tident << ",prot:" <<
147+
prot << ",app:" << app << ",host:" << host << ",domain:" << domain << "trace:"
148+
<< trace << ",onbehalf:" << onbehalf << "}";
144149
return ss.str();
145150
} else {
146151
ss << "[" << eos::common::Timing::ltime(now) << "] uid:" << uid << "[" <<
147-
uid_string << "] gid:" << gid << "[" << gid_string << "] tident:" <<
148-
tident.c_str() << " name:" << name << " dn:" << dn << " prot:" << prot <<
149-
" app:" << app << " host:" << host << " domain:" << domain << " geo:" <<
150-
geolocation << " sudo:"
151-
<< sudoer << " trace: " << trace << " onbehalf: " << onbehalf;
152+
uid_string << "] gid:" << gid << "[" << gid_string << "] tident:" <<
153+
tident.c_str() << " name:" << name << " dn:" << dn << " prot:" << prot <<
154+
" app:" << app << " host:" << host << " domain:" << domain << " geo:" <<
155+
geolocation << " sudo:"
156+
<< sudoer << " trace:" << trace << " onbehalf:" << onbehalf;
152157
return ss.str();
153158
}
154159
}

0 commit comments

Comments
 (0)