Fix a bunch of small nits.

Review URL: https://breakpad.appspot.com/463004

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1051 4c0a9323-5329-0410-9bdc-e9ce6186880e

2 files changed, 51 insertions, 53 deletions

diff --git a/src/client/mac/handler/exception_handler.cc b/src/client/mac/handler/exception_handler.cc
index 9b401330..c88b6807 100644
--- a/src/client/mac/handler/exception_handler.cc
+++ b/src/client/mac/handler/exception_handler.cc
@@ -103,11 +103,10 @@ exception_mask_t s_exception_mask = EXC_MASK_BAD_ACCESS |
 EXC_MASK_BAD_INSTRUCTION | EXC_MASK_ARITHMETIC | EXC_MASK_BREAKPOINT;
 
 #if !TARGET_OS_IPHONE
-extern "C"
-{
+extern "C" {
   // Forward declarations for functions that need "C" style compilation
-  boolean_t exc_server(mach_msg_header_t *request,
-                       mach_msg_header_t *reply);
+  boolean_t exc_server(mach_msg_header_t* request,
+                       mach_msg_header_t* reply);
 
   // This symbol must be visible to dlsym() - see
   // http://code.google.com/p/google-breakpad/issues/detail?id=345 for details.
@@ -129,19 +128,19 @@ kern_return_t ForwardException(mach_port_t task,
 
 #if TARGET_OS_IPHONE
 // Implementation is based on the implementation generated by mig.
-boolean_t breakpad_exc_server(mach_msg_header_t *InHeadP,
-                              mach_msg_header_t *OutHeadP) {
-   OutHeadP->msgh_bits =
-       MACH_MSGH_BITS(MACH_MSGH_BITS_REMOTE(InHeadP->msgh_bits), 0);
-   OutHeadP->msgh_remote_port = InHeadP->msgh_remote_port;
-   /* Minimal size: routine() will update it if different */
-   OutHeadP->msgh_size = (mach_msg_size_t)sizeof(mig_reply_error_t);
-   OutHeadP->msgh_local_port = MACH_PORT_NULL;
-   OutHeadP->msgh_id = InHeadP->msgh_id + 100;
+boolean_t breakpad_exc_server(mach_msg_header_t* InHeadP,
+                              mach_msg_header_t* OutHeadP) {
+  OutHeadP->msgh_bits =
+      MACH_MSGH_BITS(MACH_MSGH_BITS_REMOTE(InHeadP->msgh_bits), 0);
+  OutHeadP->msgh_remote_port = InHeadP->msgh_remote_port;
+  /* Minimal size: routine() will update it if different */
+  OutHeadP->msgh_size = (mach_msg_size_t)sizeof(mig_reply_error_t);
+  OutHeadP->msgh_local_port = MACH_PORT_NULL;
+  OutHeadP->msgh_id = InHeadP->msgh_id + 100;
 
   if (InHeadP->msgh_id != 2401) {
-    ((mig_reply_error_t *)OutHeadP)->NDR = NDR_record;
-    ((mig_reply_error_t *)OutHeadP)->RetCode = MIG_BAD_ID;
+    ((mig_reply_error_t*)OutHeadP)->NDR = NDR_record;
+    ((mig_reply_error_t*)OutHeadP)->RetCode = MIG_BAD_ID;
     return FALSE;
   }
 
@@ -171,8 +170,8 @@ boolean_t breakpad_exc_server(mach_msg_header_t *InHeadP,
 #pragma pack()
 #endif
 
-  Request *In0P = (Request *)InHeadP;
-  Reply *OutP = (Reply *)OutHeadP;
+  Request* In0P = (Request*)InHeadP;
+  Reply* OutP = (Reply*)OutHeadP;
 
   if (In0P->task.name != mach_task_self()) {
     return FALSE;
@@ -186,8 +185,8 @@ boolean_t breakpad_exc_server(mach_msg_header_t *InHeadP,
   return TRUE;
 }
 #else
-boolean_t breakpad_exc_server(mach_msg_header_t *request,
-                              mach_msg_header_t *reply) {
+boolean_t breakpad_exc_server(mach_msg_header_t* request,
+                              mach_msg_header_t* reply) {
   return exc_server(request, reply);
 }
 
@@ -207,9 +206,9 @@ kern_return_t catch_exception_raise(mach_port_t port, mach_port_t failed_thread,
 ExceptionHandler::ExceptionHandler(const string &dump_path,
                                    FilterCallback filter,
                                    MinidumpCallback callback,
-                                   void *callback_context,
+                                   void* callback_context,
                                    bool install_handler,
-                                   const char *port_name)
+                                   const char* port_name)
     : dump_path_(),
       filter_(filter),
       callback_(callback),
@@ -235,7 +234,7 @@ ExceptionHandler::ExceptionHandler(const string &dump_path,
 // special constructor if we want to bypass minidump writing and
 // simply get a callback with the exception information
 ExceptionHandler::ExceptionHandler(DirectCallback callback,
-                                   void *callback_context,
+                                   void* callback_context,
                                    bool install_handler)
     : dump_path_(),
       filter_(NULL),
@@ -287,18 +286,18 @@ bool ExceptionHandler::WriteMinidump(bool write_exception_stream) {
 bool ExceptionHandler::WriteMinidump(const string &dump_path,
                                      bool write_exception_stream,
                                      MinidumpCallback callback,
-                                     void *callback_context) {
+                                     void* callback_context) {
   ExceptionHandler handler(dump_path, NULL, callback, callback_context, false,
-			   NULL);
+                           NULL);
   return handler.WriteMinidump(write_exception_stream);
 }
 
 // static
 bool ExceptionHandler::WriteMinidumpForChild(mach_port_t child,
-					     mach_port_t child_blamed_thread,
-					     const string &dump_path,
-					     MinidumpCallback callback,
-					     void *callback_context) {
+                                             mach_port_t child_blamed_thread,
+                                             const string &dump_path,
+                                             MinidumpCallback callback,
+                                             void* callback_context) {
   ScopedTaskSuspend suspend(child);
 
   MinidumpGenerator generator(child, MACH_PORT_NULL);
@@ -306,22 +305,22 @@ bool ExceptionHandler::WriteMinidumpForChild(mach_port_t child,
   string dump_filename = generator.UniqueNameInDirectory(dump_path, &dump_id);
 
   generator.SetExceptionInformation(EXC_BREAKPOINT,
-#if defined (__i386__) || defined(__x86_64__)
-				    EXC_I386_BPT,
-#elif defined (__ppc__) || defined (__ppc64__)
-				    EXC_PPC_BREAKPOINT,
-#elif defined (__arm__)
-				    EXC_ARM_BREAKPOINT,
+#if defined(__i386__) || defined(__x86_64__)
+                                    EXC_I386_BPT,
+#elif defined(__ppc__) || defined(__ppc64__)
+                                    EXC_PPC_BREAKPOINT,
+#elif defined(__arm__)
+                                    EXC_ARM_BREAKPOINT,
 #else
 #error architecture not supported
 #endif
-				    0,
-				    child_blamed_thread);
+                                    0,
+                                    child_blamed_thread);
   bool result = generator.Write(dump_filename.c_str());
 
   if (callback) {
     return callback(dump_path.c_str(), dump_id.c_str(),
-		    callback_context, result);
+                    callback_context, result);
   }
   return result;
 }
@@ -329,7 +328,7 @@ bool ExceptionHandler::WriteMinidumpForChild(mach_port_t child,
 bool ExceptionHandler::WriteMinidumpWithException(int exception_type,
                                                   int exception_code,
                                                   int exception_subcode,
-                                                  ucontext_t *task_context,
+                                                  ucontext_t* task_context,
                                                   mach_port_t thread_name,
                                                   bool exit_after_write,
                                                   bool report_current_thread) {
@@ -350,12 +349,12 @@ bool ExceptionHandler::WriteMinidumpWithException(int exception_type,
       // If this is a real exception, give the filter (if any) a chance to
       // decide if this should be sent.
       if (filter_ && !filter_(callback_context_))
-	return false;
+        return false;
       return crash_generation_client_->RequestDumpForException(
-	         exception_type,
-		 exception_code,
-		 exception_subcode,
-		 thread_name);
+          exception_type,
+          exception_code,
+          exception_subcode,
+          thread_name);
     }
 #endif
   } else {
@@ -450,9 +449,9 @@ kern_return_t ForwardException(mach_port_t task, mach_port_t failed_thread,
 }
 
 // static
-void *ExceptionHandler::WaitForMessage(void *exception_handler_class) {
-  ExceptionHandler *self =
-    reinterpret_cast<ExceptionHandler *>(exception_handler_class);
+void* ExceptionHandler::WaitForMessage(void* exception_handler_class) {
+  ExceptionHandler* self =
+    reinterpret_cast<ExceptionHandler*>(exception_handler_class);
   ExceptionMessage receive;
 
   // Wait for the exception info
@@ -497,11 +496,11 @@ void *ExceptionHandler::WaitForMessage(void *exception_handler_class) {
         if (receive.header.msgh_id == kWriteDumpWithExceptionMessage) {
           thread = receive.thread.name;
           exception_type = EXC_BREAKPOINT;
-#if defined (__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__x86_64__)
           exception_code = EXC_I386_BPT;
-#elif defined (__ppc__) || defined (__ppc64__)
+#elif defined(__ppc__) || defined(__ppc64__)
           exception_code = EXC_PPC_BREAKPOINT;
-#elif defined (__arm__)
+#elif defined(__arm__)
           exception_code = EXC_ARM_BREAKPOINT;
 #else
 #error architecture not supported
@@ -582,7 +581,7 @@ void *ExceptionHandler::WaitForMessage(void *exception_handler_class) {
   return NULL;
 }
 
-//static
+// static
 void ExceptionHandler::SignalHandler(int sig, siginfo_t* info, void* uc) {
 #if USE_PROTECTED_ALLOCATIONS
   if (gBreakpadAllocator)
@@ -636,7 +635,6 @@ bool ExceptionHandler::InstallHandler() {
 #else
     previous_ = new ExceptionParameters();
 #endif
-
   }
   catch (std::bad_alloc) {
     return false;
@@ -735,7 +733,7 @@ bool ExceptionHandler::Setup(bool install_handler) {
     result = thread_create_result ? KERN_FAILURE : KERN_SUCCESS;
   }
 
-  return result == KERN_SUCCESS ? true : false;
+  return result == KERN_SUCCESS;
 }
 
 bool ExceptionHandler::Teardown() {
diff --git a/src/common/linux/linux_libc_support.h b/src/common/linux/linux_libc_support.h
index 011048f8..3429600b 100644
--- a/src/common/linux/linux_libc_support.h
+++ b/src/common/linux/linux_libc_support.h
@@ -57,7 +57,7 @@ extern unsigned my_uint_len(uintmax_t i);
 
 // Convert an unsigned integer to a string
 //   output: (output) the resulting string is written here. This buffer must be
-//     large enough to hold the resulting string. Call |my_int_len| to get the
+//     large enough to hold the resulting string. Call |my_uint_len| to get the
 //     required length.
 //   i: the unsigned integer to serialise.
 //   i_len: the length of the integer in base 10 (see |my_uint_len|).