OpenBSD patches for base and build, part 2

base/sys_info_linux.cc

 // Copyright (c) 2009 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.
 
 #include "base/sys_info.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/string_number_conversions.h"
 
 namespace base {
 
 int64 SysInfo::AmountOfPhysicalMemory() {
   long pages = sysconf(_SC_PHYS_PAGES);
   long page_size = sysconf(_SC_PAGE_SIZE);
   if (pages == -1 || page_size == -1) {
     NOTREACHED();
     return 0;
   }
 
   return static_cast<int64>(pages) * page_size;
 }
 
 // static
 size_t SysInfo::MaxSharedMemorySize() {
-  static size_t limit;
+  static int64 limit;
   static bool limit_valid = false;
   if (!limit_valid) {
     std::string contents;
     file_util::ReadFileToString(FilePath("/proc/sys/kernel/shmmax"), &contents);
-    limit = strtoul(contents.c_str(), NULL, 0);
-    limit_valid = true;
+    DCHECK(!contents.empty());
+    if (base::StringToInt64(contents, &limit)) {
+      DCHECK((size_t) limit <= sizeof(limit));

[Mark Mentovai, 2011/10/24 18:09:58]

Use static_cast<size_t>(limit). Reference:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Castin...

[Mark Mentovai, 2011/10/24 18:09:58]

Also DCHECK(limit >= 0).

[Robert Nagy, 2011/10/24 18:20:17]

Done.

[Robert Nagy, 2011/10/24 18:20:17]

Done.

+      limit_valid = true;
+    } else {
+      NOTREACHED();
+      return 0;
+    }
   }
-  return limit;
+  return static_cast<size_t>(limit);
 }
 
 }  // namespace base