summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authorcraig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-10 15:18:51 +0000
committercraig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-10 15:18:51 +0000
commit012a67451afc724a41e26bd7998aa8523d294959 (patch)
treebe9ee41bf4a8652639506dfde11cf869f9bcd5cf /sandbox
parent018fecd4e824983bf016e6d638a059dd3fac3cc4 (diff)
downloadchromium_src-012a67451afc724a41e26bd7998aa8523d294959.zip
chromium_src-012a67451afc724a41e26bd7998aa8523d294959.tar.gz
chromium_src-012a67451afc724a41e26bd7998aa8523d294959.tar.bz2
Make sandbox code compile as "chromium_code".
This sets up useful flags like -Wall -Werror etc. Also squash a compiler warning: sandbox/linux/suid/process_util_linux.c: In function ‘AdjustOOMScore’: sandbox/linux/suid/process_util_linux.c:25: error: format ‘%lu’ expects type ‘long unsigned int’, but argument 4 has type ‘pid_t’ BUG=none TEST=try-servers Review URL: http://codereview.chromium.org/733001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41161 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/linux/suid/process_util_linux.c5
-rw-r--r--sandbox/sandbox.gyp3
2 files changed, 6 insertions, 2 deletions
diff --git a/sandbox/linux/suid/process_util_linux.c b/sandbox/linux/suid/process_util_linux.c
index 4a574ad..9f40f39 100644
--- a/sandbox/linux/suid/process_util_linux.c
+++ b/sandbox/linux/suid/process_util_linux.c
@@ -8,6 +8,7 @@
#include "process_util.h"
#include <fcntl.h>
+#include <inttypes.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
@@ -20,9 +21,9 @@ bool AdjustOOMScore(pid_t process, int score) {
if (score < 0 || score > 15)
return false;
- char oom_adj[35]; // "/proc/" + log_2(2**64) + "/oom_adj\0"
+ char oom_adj[35]; // "/proc/" + log_10(2**64) + "/oom_adj\0"
// 6 + 20 + 9 = 35
- snprintf(oom_adj, sizeof(oom_adj), "/proc/%lu", process);
+ snprintf(oom_adj, sizeof(oom_adj), "/proc/%" PRIdMAX, (intmax_t)process);
struct stat statbuf;
if (stat(oom_adj, &statbuf) < 0)
diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
index 87f4f33..50094f9 100644
--- a/sandbox/sandbox.gyp
+++ b/sandbox/sandbox.gyp
@@ -3,6 +3,9 @@
# found in the LICENSE file.
{
+ 'variables': {
+ 'chromium_code': 1,
+ },
'target_defaults': {
'variables': {
'sandbox_windows_target': 0,