fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing many clang warnings.

Browse Source
This commit is contained in:
Ben Vanik
2014-08-21 23:10:08 -07:00
parent 7ae303dfa2
commit 6f802c2432
14 changed files with 260 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/xenia/kernel/fs/devices/disc_image_entry.cc
View File

@@ -20,22 +20,18 @@ namespace fs {
class DiscImageMemoryMapping : public MemoryMapping {
public:
DiscImageMemoryMapping(uint8_t* address, size_t length,
poly::MappedMemory* mmap)
: MemoryMapping(address, length), mmap_(mmap) {}
DiscImageMemoryMapping(uint8_t* address, size_t length)
: MemoryMapping(address, length) {}
virtual ~DiscImageMemoryMapping() {}
private:
poly::MappedMemory* mmap_;
~DiscImageMemoryMapping() override = default;
};
DiscImageEntry::DiscImageEntry(Type type, Device* device, const char* path,
poly::MappedMemory* mmap, GDFXEntry* gdfx_entry)
: gdfx_entry_(gdfx_entry),
gdfx_entry_iterator_(gdfx_entry->children.end()),
: Entry(type, device, path),
mmap_(mmap),
Entry(type, device, path) {}
gdfx_entry_(gdfx_entry),
gdfx_entry_iterator_(gdfx_entry->children.end()) {}
DiscImageEntry::~DiscImageEntry() {}
@@ -107,7 +103,7 @@ std::unique_ptr<MemoryMapping> DiscImageEntry::CreateMemoryMapping(
size_t real_length =
length ? std::min(length, gdfx_entry_->size) : gdfx_entry_->size;
return std::make_unique<DiscImageMemoryMapping>(mmap_->data() + real_offset,
real_length, mmap_);
real_length);
}
X_STATUS DiscImageEntry::Open(KernelState* kernel_state, Mode mode, bool async,

18
src/xenia/kernel/fs/devices/disc_image_entry.h
View File

@@ -27,21 +27,21 @@ class DiscImageEntry : public Entry {
public:
DiscImageEntry(Type type, Device* device, const char* path,
poly::MappedMemory* mmap, GDFXEntry* gdfx_entry);
virtual ~DiscImageEntry();
~DiscImageEntry() override;
poly::MappedMemory* mmap() const { return mmap_; }
GDFXEntry* gdfx_entry() const { return gdfx_entry_; }
virtual X_STATUS QueryInfo(XFileInfo* out_info);
virtual X_STATUS QueryDirectory(XDirectoryInfo* out_info, size_t length,
const char* file_name, bool restart);
X_STATUS QueryInfo(XFileInfo* out_info) override;
X_STATUS QueryDirectory(XDirectoryInfo* out_info, size_t length,
const char* file_name, bool restart) override;
virtual bool can_map() { return true; }
virtual std::unique_ptr<MemoryMapping> CreateMemoryMapping(
Mode map_mode, const size_t offset, const size_t length);
bool can_map() override { return true; }
std::unique_ptr<MemoryMapping> CreateMemoryMapping(
Mode map_mode, const size_t offset, const size_t length) override;
virtual X_STATUS Open(KernelState* kernel_state, Mode mode, bool async,
XFile** out_file);
X_STATUS Open(KernelState* kernel_state, Mode mode, bool async,
XFile** out_file) override;
private:
poly::MappedMemory* mmap_;

18
src/xenia/kernel/fs/devices/host_path_entry.h
View File

@@ -22,20 +22,20 @@ class HostPathEntry : public Entry {
public:
HostPathEntry(Type type, Device* device, const char* path,
const std::wstring& local_path);
virtual ~HostPathEntry();
~HostPathEntry() override;
const std::wstring& local_path() { return local_path_; }
virtual X_STATUS QueryInfo(XFileInfo* out_info);
virtual X_STATUS QueryDirectory(XDirectoryInfo* out_info, size_t length,
const char* file_name, bool restart);
X_STATUS QueryInfo(XFileInfo* out_info) override;
X_STATUS QueryDirectory(XDirectoryInfo* out_info, size_t length,
const char* file_name, bool restart) override;
virtual bool can_map() { return true; }
virtual std::unique_ptr<MemoryMapping> CreateMemoryMapping(
Mode map_mode, const size_t offset, const size_t length);
bool can_map() override { return true; }
std::unique_ptr<MemoryMapping> CreateMemoryMapping(
Mode map_mode, const size_t offset, const size_t length) override;
virtual X_STATUS Open(KernelState* kernel_state, Mode mode, bool async,
XFile** out_file);
X_STATUS Open(KernelState* kernel_state, Mode mode, bool async,
XFile** out_file) override;
private:
std::wstring local_path_;

8
src/xenia/kernel/fs/devices/stfs_container_entry.cc
View File

@@ -20,12 +20,12 @@ STFSContainerEntry::STFSContainerEntry(Type type, Device* device,
const char* path,
poly::MappedMemory* mmap,
STFSEntry* stfs_entry)
: stfs_entry_(stfs_entry),
stfs_entry_iterator_(stfs_entry->children.end()),
: Entry(type, device, path),
mmap_(mmap),
Entry(type, device, path) {}
stfs_entry_(stfs_entry),
stfs_entry_iterator_(stfs_entry->children.end()) {}
STFSContainerEntry::~STFSContainerEntry() {}
STFSContainerEntry::~STFSContainerEntry() = default;
X_STATUS STFSContainerEntry::QueryInfo(XFileInfo* out_info) {
assert_not_null(out_info);

12
src/xenia/kernel/fs/devices/stfs_container_entry.h
View File

@@ -27,17 +27,17 @@ class STFSContainerEntry : public Entry {
public:
STFSContainerEntry(Type type, Device* device, const char* path,
poly::MappedMemory* mmap, STFSEntry* stfs_entry);
virtual ~STFSContainerEntry();
~STFSContainerEntry() override;
poly::MappedMemory* mmap() const { return mmap_; }
STFSEntry* stfs_entry() const { return stfs_entry_; }
virtual X_STATUS QueryInfo(XFileInfo* out_info);
virtual X_STATUS QueryDirectory(XDirectoryInfo* out_info, size_t length,
const char* file_name, bool restart);
X_STATUS QueryInfo(XFileInfo* out_info) override;
X_STATUS QueryDirectory(XDirectoryInfo* out_info, size_t length,
const char* file_name, bool restart) override;
virtual X_STATUS Open(KernelState* kernel_state, Mode desired_access,
bool async, XFile** out_file);
X_STATUS Open(KernelState* kernel_state, Mode desired_access, bool async,
XFile** out_file) override;
private:
poly::MappedMemory* mmap_;

2
src/xenia/kernel/fs/devices/stfs_container_file.cc
View File

@@ -21,7 +21,7 @@ namespace fs {
STFSContainerFile::STFSContainerFile(KernelState* kernel_state, Mode mode,
STFSContainerEntry* entry)
: entry_(entry), XFile(kernel_state, mode) {}
: XFile(kernel_state, mode), entry_(entry) {}
STFSContainerFile::~STFSContainerFile() { delete entry_; }