From 2f4a8e1220d91ba95c2c46ec232dd53d27807ecd Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Tue, 25 Oct 2011 03:06:12 +0000 Subject: Revert 107042 - Replace most LOG/CHECK statements with DLOG/DCHECK statements in base. I tried hard not to change CHECKs that had side effects. I kept fatal checks that seemed security or debugging-info (in crash reports) sensitive, and ones that seems particularly well-conceived. Review URL: http://codereview.chromium.org/8368009 TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/8351025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107051 0039d316-1c4b-4281-b951-d872f2087c98 --- base/linux_util.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'base/linux_util.cc') diff --git a/base/linux_util.cc b/base/linux_util.cc index 6751469..c0757fa 100644 --- a/base/linux_util.cc +++ b/base/linux_util.cc @@ -88,7 +88,7 @@ bool ProcPathGetInode(ino_t* inode_out, const char* path, bool log = false) { const ssize_t n = readlink(path, buf, sizeof(buf) - 1); if (n == -1) { if (log) { - DLOG(WARNING) << "Failed to read the inode number for a socket from /proc" + LOG(WARNING) << "Failed to read the inode number for a socket from /proc" "(" << errno << ")"; } return false; @@ -97,8 +97,8 @@ bool ProcPathGetInode(ino_t* inode_out, const char* path, bool log = false) { if (memcmp(kSocketLinkPrefix, buf, sizeof(kSocketLinkPrefix) - 1)) { if (log) { - DLOG(WARNING) << "The descriptor passed from the crashing process wasn't " - " a UNIX domain socket."; + LOG(WARNING) << "The descriptor passed from the crashing process wasn't a" + " UNIX domain socket."; } return false; } @@ -111,8 +111,8 @@ bool ProcPathGetInode(ino_t* inode_out, const char* path, bool log = false) { if (inode_ul == ULLONG_MAX) { if (log) { - DLOG(WARNING) << "Failed to parse a socket's inode number: the number " - "was too large. Please report this bug: " << buf; + LOG(WARNING) << "Failed to parse a socket's inode number: the number was " + "too large. Please report this bug: " << buf; } return false; } @@ -201,7 +201,7 @@ bool FindProcessHoldingSocket(pid_t* pid_out, ino_t socket_inode) { DIR* proc = opendir("/proc"); if (!proc) { - DLOG(WARNING) << "Cannot open /proc"; + LOG(WARNING) << "Cannot open /proc"; return false; } @@ -263,7 +263,7 @@ pid_t FindThreadIDWithSyscall(pid_t pid, const std::string& expected_data, DIR* task = opendir(buf); if (!task) { - DLOG(WARNING) << "Cannot open " << buf; + LOG(WARNING) << "Cannot open " << buf; return -1; } -- cgit v1.1