projects
/
platform
/
upstream
/
glog.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ebf81ac
)
Style fixes for consistency
author
Shinichiro Hamaji
<shinichiro.hamaji@gmail.com>
Fri, 20 Oct 2017 07:11:31 +0000
(16:11 +0900)
committer
Shinichiro Hamaji
<shinichiro.hamaji@gmail.com>
Fri, 20 Oct 2017 07:11:31 +0000
(16:11 +0900)
src/utilities.cc
patch
|
blob
|
history
diff --git
a/src/utilities.cc
b/src/utilities.cc
index
1a3c7e1
..
98dc090
100644
(file)
--- a/
src/utilities.cc
+++ b/
src/utilities.cc
@@
-306,21
+306,19
@@
static void MyUserNameInitializer() {
g_my_user_name = user;
} else {
#if defined(HAVE_PWD_H) && defined(HAVE_UNISTD_H)
g_my_user_name = user;
} else {
#if defined(HAVE_PWD_H) && defined(HAVE_UNISTD_H)
- uid_t uid;
struct passwd pwd;
struct passwd pwd;
- struct passwd*result = NULL;
+ struct passwd*
result = NULL;
char buffer[1024] = {'\0'};
char buffer[1024] = {'\0'};
- uid = geteuid();
- int pwuid_res = getpwuid_r(uid, &pwd, buffer, sizeof
(buffer), &result);
- if(pwuid_res == 0) {
+ uid
_t uid
= geteuid();
+ int pwuid_res = getpwuid_r(uid, &pwd, buffer, sizeof(buffer), &result);
+ if
(pwuid_res == 0) {
g_my_user_name = pwd.pw_name;
g_my_user_name = pwd.pw_name;
- }
- else {
+ } else {
snprintf(buffer, sizeof(buffer), "uid%d", uid);
g_my_user_name = buffer;
}
#endif
snprintf(buffer, sizeof(buffer), "uid%d", uid);
g_my_user_name = buffer;
}
#endif
- if(g_my_user_name.empty()) {
+ if
(g_my_user_name.empty()) {
g_my_user_name = "invalid-user";
}
}
g_my_user_name = "invalid-user";
}
}