aboutsummaryrefslogtreecommitdiff
path: root/src/client/linux/crash_generation/crash_generation_server.cc
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2010-11-08 19:49:25 +0000
committerthestig@chromium.org <thestig@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2010-11-08 19:49:25 +0000
commitf66ff1afd2e0f7f16ac2f8d40984cf799f3f099b (patch)
treee605e9daa530ae4ea0fc31bd01f8046da54e8ea4 /src/client/linux/crash_generation/crash_generation_server.cc
parentUse STABS as the debugging format when using GCC 4.0 and the 10.4 SDK. (diff)
downloadbreakpad-f66ff1afd2e0f7f16ac2f8d40984cf799f3f099b.tar.xz
Delete an old Makefile and fix lots of lint errors.
Review URL: http://breakpad.appspot.com/225001 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@727 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/linux/crash_generation/crash_generation_server.cc')
-rw-r--r--src/client/linux/crash_generation/crash_generation_server.cc30
1 files changed, 16 insertions, 14 deletions
diff --git a/src/client/linux/crash_generation/crash_generation_server.cc b/src/client/linux/crash_generation/crash_generation_server.cc
index ff380aa5..2f7edb69 100644
--- a/src/client/linux/crash_generation/crash_generation_server.cc
+++ b/src/client/linux/crash_generation/crash_generation_server.cc
@@ -39,6 +39,8 @@
#include <sys/types.h>
#include <unistd.h>
+#include <vector>
+
#include "client/linux/crash_generation/crash_generation_server.h"
#include "client/linux/crash_generation/client_info.h"
#include "client/linux/handler/exception_handler.h"
@@ -142,15 +144,15 @@ FindProcessHoldingSocket(pid_t* pid_out, ino_t socket_inode)
ino_t fd_inode;
if (GetInodeForProcPath(&fd_inode, buf)
- && fd_inode == socket_inode) {
- if (already_found) {
- closedir(fd);
- return false;
- }
-
- already_found = true;
- *pid_out = current_pid;
- break;
+ && fd_inode == socket_inode) {
+ if (already_found) {
+ closedir(fd);
+ return false;
+ }
+
+ already_found = true;
+ *pid_out = current_pid;
+ break;
}
}
@@ -224,11 +226,11 @@ CrashGenerationServer::Stop()
{
assert(pthread_self() != thread_);
- if (!started_)
- return;
+ if (!started_)
+ return;
HANDLE_EINTR(write(control_pipe_out_, &kCommandQuit, 1));
-
+
void* dummy;
pthread_join(thread_, &dummy);
@@ -280,7 +282,7 @@ CrashGenerationServer::Run()
if (EINTR == errno) {
continue;
} else {
- return;
+ return;
}
}
@@ -463,4 +465,4 @@ CrashGenerationServer::ThreadMain(void *arg)
return NULL;
}
-} // namespace google_breakpad
+} // namespace google_breakpad