aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore5
-rw-r--r--src/client/linux/handler/exception_handler_unittest.cc2
-rw-r--r--src/processor/minidump_dump.cc6
3 files changed, 9 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index e177ccb9..e883e59f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,11 @@ lib*.a
/src/tools/mac/dump_syms/dump_syms
/src/tools/mac/dump_syms/dump_syms_mac
+# Ignore unit test artifacts.
+*_unittest
+*.log
+*.trs
+
# Ignore autotools generated artifacts.
.deps
.dirstamp
diff --git a/src/client/linux/handler/exception_handler_unittest.cc b/src/client/linux/handler/exception_handler_unittest.cc
index eda60c95..193a76e7 100644
--- a/src/client/linux/handler/exception_handler_unittest.cc
+++ b/src/client/linux/handler/exception_handler_unittest.cc
@@ -468,7 +468,7 @@ TEST(ExceptionHandlerTest, StackedHandlersUnhandledToBottom) {
namespace {
const int kSimpleFirstChanceReturnStatus = 42;
bool SimpleFirstChanceHandler(int, void*, void*) {
- exit(kSimpleFirstChanceReturnStatus);
+ _exit(kSimpleFirstChanceReturnStatus);
}
}
diff --git a/src/processor/minidump_dump.cc b/src/processor/minidump_dump.cc
index 4d916276..b9b7555e 100644
--- a/src/processor/minidump_dump.cc
+++ b/src/processor/minidump_dump.cc
@@ -212,7 +212,7 @@ static bool PrintMinidumpDump(const Options& options) {
//=============================================================================
static void
-Usage(int argc, const char *argv[], bool error) {
+Usage(int argc, char *argv[], bool error) {
FILE *fp = error ? stderr : stdout;
fprintf(fp,
@@ -228,7 +228,7 @@ Usage(int argc, const char *argv[], bool error) {
//=============================================================================
static void
-SetupOptions(int argc, const char *argv[], Options *options) {
+SetupOptions(int argc, char *argv[], Options *options) {
int ch;
while ((ch = getopt(argc, (char * const *)argv, "xh")) != -1) {
@@ -257,7 +257,7 @@ SetupOptions(int argc, const char *argv[], Options *options) {
} // namespace
-int main(int argc, const char *argv[]) {
+int main(int argc, char *argv[]) {
Options options;
BPLOG_INIT(&argc, &argv);
SetupOptions(argc, argv, &options);