Switch to standard integer types in base/files/.

base/files/file.h

 // 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.
 
 #ifndef BASE_FILES_FILE_H_
 #define BASE_FILES_FILE_H_
 
+#include <stdint.h>
+
+#include <string>
+
+#include "base/base_export.h"
+#include "base/files/file_path.h"
+#include "base/files/file_tracing.h"
+#include "base/files/scoped_file.h"
+#include "base/move.h"
+#include "base/time/time.h"
 #include "build/build_config.h"
+
 #if defined(OS_WIN)
 #include <windows.h>
+#include "base/win/scoped_handle.h"
 #endif
 
 #if defined(OS_POSIX)
 #include <sys/stat.h>
 #endif
 
-#include <string>
-
-#include "base/base_export.h"
-#include "base/basictypes.h"
-#include "base/files/file_path.h"
-#include "base/files/file_tracing.h"
-#include "base/files/scoped_file.h"
-#include "base/move.h"
-#include "base/time/time.h"
-
-#if defined(OS_WIN)
-#include "base/win/scoped_handle.h"
-#endif
-
 namespace base {
 
 #if defined(OS_WIN)
 typedef HANDLE PlatformFile;
 #elif defined(OS_POSIX)
 typedef int PlatformFile;
 
 #if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL)
 typedef struct stat stat_wrapper_t;
 #else
@@ skipping 90 matching lines @@
   // ipc/ipc_message_utils.cc.
   struct BASE_EXPORT Info {
     Info();
     ~Info();
 #if defined(OS_POSIX)
     // Fills this struct with values from |stat_info|.
     void FromStat(const stat_wrapper_t& stat_info);
 #endif
 
     // The size of the file in bytes.  Undefined when is_directory is true.
-    int64 size;
+    int64_t size;
 
     // True if the file corresponds to a directory.
     bool is_directory;
 
     // True if the file corresponds to a symbolic link.  For Windows currently
     // not supported and thus always false.
     bool is_symbolic_link;
 
     // The last modified time of a file.
     Time last_modified;
 
     // The last accessed time of a file.
     Time last_accessed;
 
     // The creation time of a file.
     Time creation_time;
   };
 
   File();
 
   // Creates or opens the given file. This will fail with 'access denied' if the
   // |path| contains path traversal ('..') components.
-  File(const FilePath& path, uint32 flags);
+  File(const FilePath& path, uint32_t flags);
 
   // Takes ownership of |platform_file|.
   explicit File(PlatformFile platform_file);
 
   // Creates an object with a specific error_details code.
   explicit File(Error error_details);
 
   File(File&& other);
 
   ~File();
 
   // Takes ownership of |platform_file|.
   static File CreateForAsyncHandle(PlatformFile platform_file);
 
   File& operator=(File&& other);
 
   // Creates or opens the given file.
-  void Initialize(const FilePath& path, uint32 flags);
+  void Initialize(const FilePath& path, uint32_t flags);
 
   // Returns |true| if the handle / fd wrapped by this object is valid.  This
   // method doesn't interact with the file system (and is safe to be called from
   // ThreadRestrictions::SetIOAllowed(false) threads).
   bool IsValid() const;
 
   // Returns true if a new file was created (or an old one truncated to zero
   // length to simulate a new file, which can happen with
   // FLAG_CREATE_ALWAYS), and false otherwise.
   bool created() const { return created_; }
 
   // Returns the OS result of opening this file. Note that the way to verify
   // the success of the operation is to use IsValid(), not this method:
   //   File file(path, flags);
   //   if (!file.IsValid())
   //     return;
   Error error_details() const { return error_details_; }
 
   PlatformFile GetPlatformFile() const;
   PlatformFile TakePlatformFile();
 
   // Destroying this object closes the file automatically.
   void Close();
 
   // Changes current position in the file to an |offset| relative to an origin
   // defined by |whence|. Returns the resultant current position in the file
   // (relative to the start) or -1 in case of error.
-  int64 Seek(Whence whence, int64 offset);
+  int64_t Seek(Whence whence, int64_t offset);
 
   // Reads the given number of bytes (or until EOF is reached) starting with the
   // given offset. Returns the number of bytes read, or -1 on error. Note that
   // this function makes a best effort to read all data on all platforms, so it
   // is not intended for stream oriented files but instead for cases when the
   // normal expectation is that actually |size| bytes are read unless there is
   // an error.
-  int Read(int64 offset, char* data, int size);
+  int Read(int64_t offset, char* data, int size);
 
   // Same as above but without seek.
   int ReadAtCurrentPos(char* data, int size);
 
   // Reads the given number of bytes (or until EOF is reached) starting with the
   // given offset, but does not make any effort to read all data on all
   // platforms. Returns the number of bytes read, or -1 on error.
-  int ReadNoBestEffort(int64 offset, char* data, int size);
+  int ReadNoBestEffort(int64_t offset, char* data, int size);
 
   // Same as above but without seek.
   int ReadAtCurrentPosNoBestEffort(char* data, int size);
 
   // Writes the given buffer into the file at the given offset, overwritting any
   // data that was previously there. Returns the number of bytes written, or -1
   // on error. Note that this function makes a best effort to write all data on
   // all platforms.
   // Ignores the offset and writes to the end of the file if the file was opened
   // with FLAG_APPEND.
-  int Write(int64 offset, const char* data, int size);
+  int Write(int64_t offset, const char* data, int size);
 
   // Save as above but without seek.
   int WriteAtCurrentPos(const char* data, int size);
 
   // Save as above but does not make any effort to write all data on all
   // platforms. Returns the number of bytes written, or -1 on error.
   int WriteAtCurrentPosNoBestEffort(const char* data, int size);
 
   // Returns the current size of this file, or a negative number on failure.
-  int64 GetLength();
+  int64_t GetLength();
 
   // Truncates the file to the given length. If |length| is greater than the
   // current size of the file, the file is extended with zeros. If the file
   // doesn't exist, |false| is returned.
-  bool SetLength(int64 length);
+  bool SetLength(int64_t length);
 
   // Instructs the filesystem to flush the file to disk. (POSIX: fsync, Windows:
   // FlushFileBuffers).
   bool Flush();
 
   // Updates the file times.
   bool SetTimes(Time last_access_time, Time last_modified_time);
 
   // Returns some basic information for the given file.
   bool GetInfo(Info* info);
@@ skipping 39 matching lines @@
 #endif
 
   // Converts an error value to a human-readable form. Used for logging.
   static std::string ErrorToString(Error error);
 
  private:
   friend class FileTracing::ScopedTrace;
 
   // Creates or opens the given file. Only called if |path| has no
   // traversal ('..') components.
-  void DoInitialize(const FilePath& path, uint32 flags);
+  void DoInitialize(const FilePath& path, uint32_t flags);
 
   // TODO(tnagel): Reintegrate into Flush() once histogram isn't needed anymore,
   // cf. issue 473337.
   bool DoFlush();
 
   void SetPlatformFile(PlatformFile file);
 
 #if defined(OS_WIN)
   win::ScopedHandle file_;
 #elif defined(OS_POSIX)
   ScopedFD file_;
 #endif
 
   // A path to use for tracing purposes. Set if file tracing is enabled during
   // |Initialize()|.
   FilePath tracing_path_;
 
   // Object tied to the lifetime of |this| that enables/disables tracing.
   FileTracing::ScopedEnabler trace_enabler_;
 
   Error error_details_;
   bool created_;
   bool async_;
 };
 
 }  // namespace base
 
 #endif  // BASE_FILES_FILE_H_