diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 20:47:47 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 20:47:47 +0000 |
commit | bfde7449259ccf84393fd6751fca30ea36eb0368 (patch) | |
tree | 3135f358d5eedda8038ad3e3d6e24107d171609e /sandbox | |
parent | ac9952bd1cc3880f70a67d3582c9dd51506f4297 (diff) | |
download | chromium_src-bfde7449259ccf84393fd6751fca30ea36eb0368.zip chromium_src-bfde7449259ccf84393fd6751fca30ea36eb0368.tar.gz chromium_src-bfde7449259ccf84393fd6751fca30ea36eb0368.tar.bz2 |
win: Fix a few minor issues found by clang.
No intended functionality change.
BUG=82385
TEST=compiles
Review URL: http://codereview.chromium.org/10332002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
-rw-r--r-- | sandbox/src/Wow64.cc | 2 | ||||
-rw-r--r-- | sandbox/src/sandbox_nt_util.cc | 4 | ||||
-rw-r--r-- | sandbox/src/target_process.cc | 2 | ||||
-rw-r--r-- | sandbox/src/target_process.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sandbox/src/Wow64.cc b/sandbox/src/Wow64.cc index 9f10a4b..5098647 100644 --- a/sandbox/src/Wow64.cc +++ b/sandbox/src/Wow64.cc @@ -137,7 +137,7 @@ bool Wow64::WaitForNtdll() { } bool Wow64::RunWowHelper(void* buffer) { - COMPILE_ASSERT(sizeof(buffer) <= sizeof DWORD, unsupported_64_bits); + COMPILE_ASSERT(sizeof(buffer) <= sizeof(DWORD), unsupported_64_bits); // Get the path to the helper (beside the exe). wchar_t prog_name[MAX_PATH]; diff --git a/sandbox/src/sandbox_nt_util.cc b/sandbox/src/sandbox_nt_util.cc index e730ddb..94a343a 100644 --- a/sandbox/src/sandbox_nt_util.cc +++ b/sandbox/src/sandbox_nt_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -538,7 +538,7 @@ void* operator new(size_t size, sandbox::AllocationType type, if (NT_ALLOC == type) { if (!InitHeap()) - return false; + return NULL; // Use default flags for the allocation. return g_nt.RtlAllocateHeap(sandbox::g_heap, 0, size); diff --git a/sandbox/src/target_process.cc b/sandbox/src/target_process.cc index 1e3f9a0..d221158 100644 --- a/sandbox/src/target_process.cc +++ b/sandbox/src/target_process.cc @@ -209,7 +209,7 @@ DWORD TargetProcess::Create(const wchar_t* exe_path, return win_result; } -ResultCode TargetProcess::TransferVariable(char* name, void* address, +ResultCode TargetProcess::TransferVariable(const char* name, void* address, size_t size) { if (!sandbox_process_info_.IsValid()) return SBOX_ERROR_UNEXPECTED_CALL; diff --git a/sandbox/src/target_process.h b/sandbox/src/target_process.h index 5afe654..7d16153 100644 --- a/sandbox/src/target_process.h +++ b/sandbox/src/target_process.h @@ -81,7 +81,7 @@ class TargetProcess { } // Transfers a 32-bit variable between the broker and the target. - ResultCode TransferVariable(char* name, void* address, size_t size); + ResultCode TransferVariable(const char* name, void* address, size_t size); private: // Details of the target process. |