Merge branch 'master' of github.com:wombatant/ox

src/ox/fs/filesystem.hpp

@@ -206,7 +206,7 @@ int FileSystemTemplate<FileStore>::write(uint64_t inode, void *buffer, uint64_t
 #endif
 template<typename FileStore>
 uint8_t *FileSystemTemplate<FileStore>::format(void *buffer, typename FileStore::FsSize_t size, bool useDirectories) {
-	buffer = FileStore::format((uint8_t*) buffer, size, FS_TYPE);
+	buffer = FileStore::format((uint8_t*) buffer, size, (uint32_t) FileSystemTemplate<FileStore>::FS_TYPE);
 	auto fs = createFileSystem(buffer);
 
 	if (buffer && useDirectories) {

src/ox/fs/oxfstool.cpp

@@ -72,7 +72,7 @@ size_t bytes(const char *str) {
 		}
 	}
 	const auto retval = ((size_t) ox_atoi(copy)) * multiplier;
-	delete copy;
+	delete []copy;
 	return  retval;
 }
 

src/ox/std/types.hpp

@@ -14,7 +14,7 @@ typedef unsigned short     uint16_t;
 typedef int                int32_t;
 typedef unsigned int       uint32_t;
 typedef unsigned           uint_t;
-typedef long long          int64_t;
+typedef long               int64_t;
 typedef unsigned long long uint64_t;
 
 namespace ox {