Updated code to be compliant with style guidelines

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

1 files changed, 46 insertions, 22 deletions

diff --git a/src/client/mac/handler/testcases/DynamicImagesTests.cc b/src/client/mac/handler/testcases/DynamicImagesTests.cc
index 15976a25..1ddb79c4 100644
--- a/src/client/mac/handler/testcases/DynamicImagesTests.cc
+++ b/src/client/mac/handler/testcases/DynamicImagesTests.cc
@@ -1,37 +1,62 @@
-/*
- *  DynamicImagesTests.cpp
- *  minidump_test
- *
- *  Created by Neal Sidhwaney on 4/17/08.
- *  Copyright 2008 Google Inc. All rights reserved.
- *
- */
+// Copyright (c) 2008, Google Inc.
+// All rights reserved
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "DynamicImagesTests.h"
-#include "dynamic_images.h"
+//
+//  DynamicImagesTests.cpp
+//  minidump_test
+//
+//  Created by Neal Sidhwaney on 4/17/08.
+//  Copyright 2008 Google Inc. All rights reserved.
+//
 
-DynamicImagesTests test2(TEST_INVOCATION(DynamicImagesTests, ReadTaskMemoryTest));
+#include "client/mac/handler/testcases/DynamicImagesTests.h"
+#include "client/mac/handler/dynamic_images.h"
+
+DynamicImagesTests test2(TEST_INVOCATION(DynamicImagesTests,
+                                         ReadTaskMemoryTest));
 
 DynamicImagesTests::DynamicImagesTests(TestInvocation *invocation)
-    : TestCase(invocation)
-{
+    : TestCase(invocation) {
 }
 
 
-DynamicImagesTests::~DynamicImagesTests()
-{
+DynamicImagesTests::~DynamicImagesTests() {
 }
 
-void DynamicImagesTests::ReadTaskMemoryTest()
-{
+void DynamicImagesTests::ReadTaskMemoryTest() {
   kern_return_t kr;
 
   // pick test2 as a symbol we know to be valid to read
   // anything will work, really
-  void *addr = (void*)&test2;
-
+  void *addr = reinterpret_cast<void*>(&test2);
   void *buf;
-  fprintf(stderr, "reading 0x%p\n",addr);
+
+  fprintf(stderr, "reading 0x%p\n", addr);
   buf = google_breakpad::ReadTaskMemory(mach_task_self(),
                                         addr,
                                         getpagesize(),
@@ -41,8 +66,7 @@ void DynamicImagesTests::ReadTaskMemoryTest()
 
   CPTAssert(buf != NULL);
 
-  CPTAssert(0 == memcmp(buf,(const void*)addr,getpagesize()));
+  CPTAssert(0 == memcmp(buf, (const void*)addr, getpagesize()));
 
   free(buf);
-
 }