From b58c344604f0ac9fa11c9890aa44d22db2457b69 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Tue, 5 Jul 2016 19:10:32 -0400
Subject: [PATCH] rename FileReader::load() -> FileReader::read()

---
 src/core/FileLoader.cc | 2 +-
 src/core/FileReader.cc | 8 ++++----
 src/core/FileReader.h  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/FileLoader.cc b/src/core/FileLoader.cc
index 9b301b4..dd966f8 100644
--- a/src/core/FileLoader.cc
+++ b/src/core/FileLoader.cc
@@ -27,7 +27,7 @@ bool FileLoader::load(const char * fname)
 {
     size_t size;
 
-    if (!FileReader::load(fname, &m_buf, &size))
+    if (!FileReader::read(fname, &m_buf, &size))
     {
         return false;
     }
diff --git a/src/core/FileReader.cc b/src/core/FileReader.cc
index 3d0b568..22af735 100644
--- a/src/core/FileReader.cc
+++ b/src/core/FileReader.cc
@@ -19,11 +19,11 @@
  * @param[out] size Set to length of the file. If the return value is true
  *   and *size is 0, then no buffer was allocated and *buf should not be used.
  *
- * @retval false The file failed to load. In this case the output parameter
+ * @retval false The file failed to read. In this case the output parameter
  *   values *buf and *size should not be used.
- * @retval true The file was loaded successfully.
+ * @retval true The file was read successfully.
  */
-bool FileReader::load(const char * fname, uint8_t ** buf, size_t * size)
+bool FileReader::read(const char * fname, uint8_t ** buf, size_t * size)
 {
     struct stat st;
     if (stat(fname, &st) != 0)
@@ -53,7 +53,7 @@ bool FileReader::load(const char * fname, uint8_t ** buf, size_t * size)
     off_t n_bytes_read = 0u;
     for (;;)
     {
-        off_t rd_size = read(fd, &(*buf)[n_bytes_read], st.st_size - n_bytes_read);
+        off_t rd_size = ::read(fd, &(*buf)[n_bytes_read], st.st_size - n_bytes_read);
         if (rd_size <= 0)
             break;
         n_bytes_read += rd_size;
diff --git a/src/core/FileReader.h b/src/core/FileReader.h
index b961206..8e56417 100644
--- a/src/core/FileReader.h
+++ b/src/core/FileReader.h
@@ -7,7 +7,7 @@
 class FileReader
 {
 public:
-    static bool load(const char * fname, uint8_t ** buf, size_t * size);
+    static bool read(const char * fname, uint8_t ** buf, size_t * size);
 };
 
 #endif