ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "liblog: remove code checking for fd = 0"

Browse source
This commit is contained in:
Tom Cherry 2019-10-08 19:24:02 +00:00 • committed by Gerrit Code Review
commit 5d7969b58a
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
liblog/logd_reader.cpp
View file

@ -107,7 +107,7 @@ static int socket_local_client(const std::string& name, int type) {
strlcpy(addr.sun_path, path.c_str(), sizeof(addr.sun_path)); strlcpy(addr.sun_path, path.c_str(), sizeof(addr.sun_path));
int fd = socket(AF_LOCAL, type | SOCK_CLOEXEC, 0); int fd = socket(AF_LOCAL, type | SOCK_CLOEXEC, 0);
if (fd == 0) { if (fd == -1) {
return -1; return -1;
} }
@ -337,12 +337,6 @@ static int logdOpen(struct android_log_logger_list* logger_list,
} }
sock = socket_local_client("logdr", SOCK_SEQPACKET); sock = socket_local_client("logdr", SOCK_SEQPACKET);
if (sock == 0) {
/* Guarantee not file descriptor zero */
int newsock = socket_local_client("logdr", SOCK_SEQPACKET);
close(sock);
sock = newsock;
}
if (sock <= 0) { if (sock <= 0) {
if ((sock == -1) && errno) { if ((sock == -1) && errno) {
return -errno; return -errno;