3 files changed, 17 insertions, 16 deletions
diff --git a/src/client/ios/Breakpad.mm b/src/client/ios/Breakpad.mm
index efcc35b5..f3554063 100644
--- a/src/client/ios/Breakpad.mm
+++ b/src/client/ios/Breakpad.mm
@@ -310,8 +310,6 @@ Breakpad::~Breakpad() {
 
 //=============================================================================
 bool Breakpad::ExtractParameters(NSDictionary *parameters) {
-  NSUserDefaults *stdDefaults = [NSUserDefaults standardUserDefaults];
-
   NSString *serverType = [parameters objectForKey:@BREAKPAD_SERVER_TYPE];
   NSString *display = [parameters objectForKey:@BREAKPAD_PRODUCT_DISPLAY];
   NSString *product = [parameters objectForKey:@BREAKPAD_PRODUCT];
@@ -825,5 +823,6 @@ NSDictionary *BreakpadGenerateReport(BreakpadRef ref,
     }
   } catch(...) {    // don't let exceptions leave this C API
     fprintf(stderr, "BreakpadGenerateReport() : error\n");
+    return nil;
   }
 }
diff --git a/src/client/mac/handler/exception_handler.cc b/src/client/mac/handler/exception_handler.cc
index 54eb409d..eac19085 100644
--- a/src/client/mac/handler/exception_handler.cc
+++ b/src/client/mac/handler/exception_handler.cc
@@ -422,13 +422,13 @@ kern_return_t ForwardException(mach_port_t task, mach_port_t failed_thread,
 
   current.count = EXC_TYPES_COUNT;
   mach_port_t current_task = mach_task_self();
-  kern_return_t result = task_get_exception_ports(current_task,
-                                                  s_exception_mask,
-                                                  current.masks,
-                                                  &current.count,
-                                                  current.ports,
-                                                  current.behaviors,
-                                                  current.flavors);
+  task_get_exception_ports(current_task,
+                           s_exception_mask,
+                           current.masks,
+                           &current.count,
+                           current.ports,
+                           current.behaviors,
+                           current.flavors);
 
   // Find the first exception handler that matches the exception
   unsigned int found;
@@ -450,6 +450,7 @@ kern_return_t ForwardException(mach_port_t task, mach_port_t failed_thread,
 
   mach_msg_type_number_t thread_state_count = THREAD_STATE_MAX;
   breakpad_thread_state_data_t thread_state;
+  kern_return_t result;
   switch (target_behavior) {
     case EXCEPTION_DEFAULT:
       result = exception_raise(target_port, failed_thread, task, exception,
@@ -629,9 +630,9 @@ void *ExceptionHandler::WaitForMessage(void *exception_handler_class) {
           exit(1);
 
         // Send a reply and exit
-        result = mach_msg(&(reply.header), MACH_SEND_MSG,
-                          reply.header.msgh_size, 0, MACH_PORT_NULL,
-                          MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
+        mach_msg(&(reply.header), MACH_SEND_MSG,
+                 reply.header.msgh_size, 0, MACH_PORT_NULL,
+                 MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
       }
     }
   }
diff --git a/src/client/mac/handler/minidump_generator.cc b/src/client/mac/handler/minidump_generator.cc
index 1e4ea6b5..b1d429cf 100644
--- a/src/client/mac/handler/minidump_generator.cc
+++ b/src/client/mac/handler/minidump_generator.cc
@@ -1318,8 +1318,9 @@ bool MinidumpGenerator::WriteModuleListStream(
     MDRawDirectory *module_list_stream) {
   TypedMDRVA<MDRawModuleList> list(&writer_);
 
-  int image_count = dynamic_images_ ?
-    dynamic_images_->GetImageCount() : _dyld_image_count();
+  size_t image_count = dynamic_images_ ?
+      static_cast<size_t>(dynamic_images_->GetImageCount()) :
+      _dyld_image_count();
 
   if (!list.AllocateObjectAndArray(image_count, MD_MODULE_SIZE))
     return false;
@@ -1330,7 +1331,7 @@ bool MinidumpGenerator::WriteModuleListStream(
 
   // Write out the executable module as the first one
   MDRawModule module;
-  int executableIndex = FindExecutableModule();
+  size_t executableIndex = FindExecutableModule();
 
   if (!WriteModuleStream(executableIndex, &module)) {
     return false;
@@ -1339,7 +1340,7 @@ bool MinidumpGenerator::WriteModuleListStream(
   list.CopyIndexAfterObject(0, &module, MD_MODULE_SIZE);
   int destinationIndex = 1;  // Write all other modules after this one
 
-  for (int i = 0; i < image_count; ++i) {
+  for (size_t i = 0; i < image_count; ++i) {
     if (i != executableIndex) {
       if (!WriteModuleStream(i, &module)) {
         return false;