Move more file_util functions to base namespace.
TBR=sky
Review URL: https://codereview.chromium.org/109043002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239280 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 5a6ddb19886d009376be90a25b14e5a10a26b586
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index fdf196e..ddcd5dd 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -689,6 +689,27 @@
return true;
}
+FILE* OpenFile(const FilePath& filename, const char* mode) {
+ ThreadRestrictions::AssertIOAllowed();
+ FILE* result = NULL;
+ do {
+ result = fopen(filename.value().c_str(), mode);
+ } while (!result && errno == EINTR);
+ return result;
+}
+
+int ReadFile(const FilePath& filename, char* data, int size) {
+ ThreadRestrictions::AssertIOAllowed();
+ int fd = HANDLE_EINTR(open(filename.value().c_str(), O_RDONLY));
+ if (fd < 0)
+ return -1;
+
+ ssize_t bytes_read = HANDLE_EINTR(read(fd, data, size));
+ if (int ret = IGNORE_EINTR(close(fd)) < 0)
+ return ret;
+ return bytes_read;
+}
+
} // namespace base
// -----------------------------------------------------------------------------
@@ -723,42 +744,10 @@
return base::FilePath();
}
-bool GetInode(const FilePath& path, ino_t* inode) {
- base::ThreadRestrictions::AssertIOAllowed(); // For call to stat().
- struct stat buffer;
- int result = stat(path.value().c_str(), &buffer);
- if (result < 0)
- return false;
-
- *inode = buffer.st_ino;
- return true;
-}
-
FILE* OpenFile(const std::string& filename, const char* mode) {
return OpenFile(FilePath(filename), mode);
}
-FILE* OpenFile(const FilePath& filename, const char* mode) {
- base::ThreadRestrictions::AssertIOAllowed();
- FILE* result = NULL;
- do {
- result = fopen(filename.value().c_str(), mode);
- } while (!result && errno == EINTR);
- return result;
-}
-
-int ReadFile(const FilePath& filename, char* data, int size) {
- base::ThreadRestrictions::AssertIOAllowed();
- int fd = HANDLE_EINTR(open(filename.value().c_str(), O_RDONLY));
- if (fd < 0)
- return -1;
-
- ssize_t bytes_read = HANDLE_EINTR(read(fd, data, size));
- if (int ret = IGNORE_EINTR(close(fd)) < 0)
- return ret;
- return bytes_read;
-}
-
int WriteFile(const FilePath& filename, const char* data, int size) {
base::ThreadRestrictions::AssertIOAllowed();
int fd = HANDLE_EINTR(creat(filename.value().c_str(), 0666));