From 76eb01d5f388defaccac08daa6f436626ac7a645 Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Sat, 17 Dec 2016 01:24:35 -0600
Subject: [PATCH] Fix more compiler warnings for MSVC

---
 src/ox/fs/filesystem.hpp | 12 ++++++------
 src/ox/fs/oxfstool.cpp   |  6 +++---
 src/ox/std/memops.cpp    |  8 ++++----
 src/ox/std/memops.hpp    |  4 ++--
 src/ox/std/types.hpp     |  6 ++++--
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/ox/fs/filesystem.hpp b/src/ox/fs/filesystem.hpp
index 614c461aa..1579022a4 100644
--- a/src/ox/fs/filesystem.hpp
+++ b/src/ox/fs/filesystem.hpp
@@ -36,9 +36,9 @@ class FileSystem {
 	public:
 		virtual ~FileSystem() {};
 
-		virtual int read(uint64_t inode, void *buffer, uint64_t size) = 0;
+		virtual int read(uint64_t inode, void *buffer, size_t size) = 0;
 
-		virtual uint8_t *read(uint64_t inode, uint64_t *size) = 0;
+		virtual uint8_t *read(uint64_t inode, size_t *size) = 0;
 
 		virtual int remove(uint64_t inode) = 0;
 
@@ -91,9 +91,9 @@ class FileSystemTemplate: public FileSystem {
 
 		int read(const char *path, void *buffer);
 
-		uint8_t *read(uint64_t inode, uint64_t *size) override;
+		uint8_t *read(uint64_t inode, size_t *size) override;
 
-		int read(uint64_t inode, void *buffer, uint64_t size) override;
+		int read(uint64_t inode, void *buffer, size_t size) override;
 
 		int remove(uint64_t inode) override;
 
@@ -145,7 +145,7 @@ FileStat FileSystemTemplate<FileStore, FS_TYPE>::stat(uint64_t inode) {
 #pragma warning(disable:4244)
 #endif
 template<typename FileStore, FsType FS_TYPE>
-int FileSystemTemplate<FileStore, FS_TYPE>::read(uint64_t inode, void *buffer, uint64_t size) {
+int FileSystemTemplate<FileStore, FS_TYPE>::read(uint64_t inode, void *buffer, size_t size) {
 	auto err = 1;
 	auto s = store->stat(inode);
 	if (size == s.size) {
@@ -161,7 +161,7 @@ int FileSystemTemplate<FileStore, FS_TYPE>::read(uint64_t inode, void *buffer, u
 #pragma warning(disable:4244)
 #endif
 template<typename FileStore, FsType FS_TYPE>
-uint8_t *FileSystemTemplate<FileStore, FS_TYPE>::read(uint64_t inode, uint64_t *size) {
+uint8_t *FileSystemTemplate<FileStore, FS_TYPE>::read(uint64_t inode, size_t *size) {
 	auto s = store->stat(inode);
 	auto buff = new uint8_t[s.size];
 	if (size) {
diff --git a/src/ox/fs/oxfstool.cpp b/src/ox/fs/oxfstool.cpp
index 4f974cccf..5a420f037 100644
--- a/src/ox/fs/oxfstool.cpp
+++ b/src/ox/fs/oxfstool.cpp
@@ -91,7 +91,7 @@ int format(int argc, char **args) {
 
 		if (size < sizeof(FileStore64)) {
 			err = 1;
-			fprintf(stderr, "File system size %lu too small, must be at least %lu\n", (uint64_t) size, (uint64_t) sizeof(FileStore64));
+			cerr <<  "File system size " << size << " too small, must be at least " << sizeof(FileStore64) << endl;
 		}
 
 		if (!err) {
@@ -139,8 +139,8 @@ int read(int argc, char **args) {
 	if (argc >= 4) {
 		auto fsPath = args[2];
 		auto inode = ox_atoi(args[3]);
-		::size_t fsSize;
-		uint64_t fileSize;
+		size_t fsSize;
+		size_t fileSize;
 
 		auto fsBuff = loadFileBuff(fsPath, &fsSize);
 		
diff --git a/src/ox/std/memops.cpp b/src/ox/std/memops.cpp
index fc91a3664..b58713f37 100644
--- a/src/ox/std/memops.cpp
+++ b/src/ox/std/memops.cpp
@@ -7,18 +7,18 @@
  */
 #include "memops.hpp"
 
-void *ox_memcpy(void *dest, const void *src, size_t size) {
+void *ox_memcpy(void *dest, const void *src, int64_t size) {
 	char *srcBuf = (char*) src;
 	char *dstBuf = (char*) dest;
-	for (size_t i = 0; i < size; i++) {
+	for (int64_t i = 0; i < size; i++) {
 		dstBuf[i] = (char) srcBuf[i];
 	}
 	return dest;
 }
 
-void *ox_memset(void *ptr, int val, size_t size) {
+void *ox_memset(void *ptr, int val, int64_t size) {
 	char *buf = (char*) ptr;
-	for (size_t i = 0; i < size; i++) {
+	for (int64_t i = 0; i < size; i++) {
 		buf[i] = val;
 	}
 	return ptr;
diff --git a/src/ox/std/memops.hpp b/src/ox/std/memops.hpp
index 490c2c3cb..d6b1dc9e1 100644
--- a/src/ox/std/memops.hpp
+++ b/src/ox/std/memops.hpp
@@ -9,6 +9,6 @@
 
 #include "types.hpp"
 
-void *ox_memcpy(void *src, const void *dest, size_t size);
+void *ox_memcpy(void *src, const void *dest, int64_t size);
 
-void *ox_memset(void *ptr, int val, size_t size);
+void *ox_memset(void *ptr, int val, int64_t size);
diff --git a/src/ox/std/types.hpp b/src/ox/std/types.hpp
index 787b8dd8e..6d03aa47c 100644
--- a/src/ox/std/types.hpp
+++ b/src/ox/std/types.hpp
@@ -14,8 +14,6 @@ typedef unsigned short     uint16_t;
 typedef int                int32_t;
 typedef unsigned int       uint32_t;
 typedef unsigned           uint_t;
-typedef long               int64_t;
-typedef unsigned long      uint64_t;
 
 namespace ox {
 namespace std {
@@ -28,8 +26,12 @@ typedef uint32_t Error;
 #if defined(_LP64) || defined(__ppc64__) || defined(__aarch64__)
 typedef unsigned long size_t;
 #elif defined(_WIN64)
+typedef long               int64_t;
+typedef unsigned long      uint64_t;
 typedef uint64_t size_t;
 #elif defined(_LP32) || defined(__ppc__) || defined(_WIN32) || defined(__arm__)
+typedef long long          int64_t;
+typedef unsigned long long uint64_t;
 typedef uint32_t size_t;
 #else
 #error size_t undefined