diff options
| -rw-r--r-- | base/file_util.h | 6 | ||||
| -rw-r--r-- | base/global_descriptors_posix.h | 2 | ||||
| -rw-r--r-- | base/linux_util.h | 6 | ||||
| -rw-r--r-- | base/process_util.h | 6 | ||||
| -rw-r--r-- | base/safe_strerror_posix.h | 8 | ||||
| -rw-r--r-- | sandbox/linux/suid/process_util.h | 4 |
6 files changed, 14 insertions, 18 deletions
diff --git a/base/file_util.h b/base/file_util.h index 28c96e9..a187fee 100644 --- a/base/file_util.h +++ b/base/file_util.h @@ -343,7 +343,7 @@ BASE_API bool SetLastModifiedTime(const FilePath& path, #if defined(OS_POSIX) // Store inode number of |path| in |inode|. Return true on success. -BASE_API bool GetInode(const FilePath& path, ino_t* inode); +bool GetInode(const FilePath& path, ino_t* inode); #endif // Wrapper for fopen-like calls. Returns non-NULL FILE* on success. @@ -365,7 +365,7 @@ BASE_API int ReadFile(const FilePath& filename, char* data, int size); BASE_API int WriteFile(const FilePath& filename, const char* data, int size); #if defined(OS_POSIX) // Append the data to |fd|. Does not close |fd| when done. -BASE_API int WriteFileDescriptor(const int fd, const char* data, int size); +int WriteFileDescriptor(const int fd, const char* data, int size); #endif // Gets the current working directory for the process. @@ -648,7 +648,7 @@ enum FileSystemType { // Attempts determine the FileSystemType for |path|. // Returns false if |path| doesn't exist. -BASE_API bool GetFileSystemType(const FilePath& path, FileSystemType* type); +bool GetFileSystemType(const FilePath& path, FileSystemType* type); #endif } // namespace file_util diff --git a/base/global_descriptors_posix.h b/base/global_descriptors_posix.h index d4650e5..d635cff 100644 --- a/base/global_descriptors_posix.h +++ b/base/global_descriptors_posix.h @@ -34,7 +34,7 @@ namespace base { // It maps from an abstract key to a descriptor. If independent modules each // need to define keys, then values should be chosen randomly so as not to // collide. -class BASE_API GlobalDescriptors { +class GlobalDescriptors { public: typedef uint32_t Key; typedef std::vector<std::pair<Key, int> > Mapping; diff --git a/base/linux_util.h b/base/linux_util.h index 0e079d7..c1135ce 100644 --- a/base/linux_util.h +++ b/base/linux_util.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -11,8 +11,6 @@ #include <string> -#include "base/base_api.h" - namespace base { static const char kFindInodeSwitch[] = "--find-inode"; @@ -28,7 +26,7 @@ std::string GetLinuxDistro(); void SetLinuxDistro(const std::string& distro); // Return the inode number for the UNIX domain socket |fd|. -BASE_API bool FileDescriptorGetInode(ino_t* inode_out, int fd); +bool FileDescriptorGetInode(ino_t* inode_out, int fd); // Find the process which holds the given socket, named by inode number. If // multiple processes hold the socket, this function returns false. diff --git a/base/process_util.h b/base/process_util.h index 5810ce3..bb8f30e 100644 --- a/base/process_util.h +++ b/base/process_util.h @@ -165,7 +165,7 @@ BASE_API ProcessId GetProcId(ProcessHandle process); #if defined(OS_LINUX) // Returns the path to the executable of the given process. -BASE_API FilePath GetProcessExecutablePath(ProcessHandle process); +FilePath GetProcessExecutablePath(ProcessHandle process); // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. @@ -177,7 +177,7 @@ static const char kAdjustOOMScoreSwitch[] = "--adjust-oom-score"; // This adjusts /proc/process/oom_adj so the Linux OOM killer will prefer // certain process types over others. The range for the adjustment is // [-17,15], with [0,15] being user accessible. -BASE_API bool AdjustOOMScore(ProcessId process, int score); +bool AdjustOOMScore(ProcessId process, int score); #endif #if defined(OS_POSIX) @@ -187,7 +187,7 @@ BASE_API ProcessId GetParentProcessId(ProcessHandle process); // Close all file descriptors, except those which are a destination in the // given multimap. Only call this function in a child process where you know // that there aren't any other threads. -BASE_API void CloseSuperfluousFds(const InjectiveMultimap& saved_map); +void CloseSuperfluousFds(const InjectiveMultimap& saved_map); #endif #if defined(OS_WIN) diff --git a/base/safe_strerror_posix.h b/base/safe_strerror_posix.h index e72c836..03c18c8 100644 --- a/base/safe_strerror_posix.h +++ b/base/safe_strerror_posix.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -8,8 +8,6 @@ #include <string> -#include "base/base_api.h" - // BEFORE using anything from this file, first look at PLOG and friends in // logging.h and use them instead if applicable. // @@ -26,7 +24,7 @@ // result is always null-terminated. The value of errno is never changed. // // Use this instead of strerror_r(). -BASE_API void safe_strerror_r(int err, char *buf, size_t len); +void safe_strerror_r(int err, char *buf, size_t len); // Calls safe_strerror_r with a buffer of suitable size and returns the result // in a C++ string. @@ -34,6 +32,6 @@ BASE_API void safe_strerror_r(int err, char *buf, size_t len); // Use this instead of strerror(). Note though that safe_strerror_r will be // more robust in the case of heap corruption errors, since it doesn't need to // allocate a string. -BASE_API std::string safe_strerror(int err); +std::string safe_strerror(int err); #endif // BASE_SAFE_STRERROR_POSIX_H_ diff --git a/sandbox/linux/suid/process_util.h b/sandbox/linux/suid/process_util.h index a0fbb7a..68ff81d 100644 --- a/sandbox/linux/suid/process_util.h +++ b/sandbox/linux/suid/process_util.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -16,6 +16,6 @@ static const char kAdjustOOMScoreSwitch[] = "--adjust-oom-score"; // This adjusts /proc/process/oom_adj so the Linux OOM killer will prefer // certain process types over others. The range for the adjustment is // [-17,15], with [0,15] being user accessible. -BASE_API bool AdjustOOMScore(pid_t process, int score); +bool AdjustOOMScore(pid_t process, int score); #endif // SANDBOX_LINUX_SUID_PROCESS_UTIL_H_ |