diff options
| author | 2014-08-17 23:03:22 -0400 | |
|---|---|---|
| committer | 2014-08-17 23:12:20 -0400 | |
| commit | 98fa3f7cba22997aef8ec4d121584c2488389c38 (patch) | |
| tree | 40585fc835fa8fc27882923a4439d88e7ae171de /src/core/hle/kernel/archive.cpp | |
| parent | Merge pull request #52 from lioncash/memory (diff) | |
| download | yuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.tar.gz yuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.tar.xz yuzu-98fa3f7cba22997aef8ec4d121584c2488389c38.zip | |
Core: Alter the kernel string functions to use std::string instead of const char*.
Most functions already operate on std::strings. This also removes the need to manually null terminate thread names.
Diffstat (limited to 'src/core/hle/kernel/archive.cpp')
| -rw-r--r-- | src/core/hle/kernel/archive.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/archive.cpp b/src/core/hle/kernel/archive.cpp index 76b2520da..5079fcb84 100644 --- a/src/core/hle/kernel/archive.cpp +++ b/src/core/hle/kernel/archive.cpp | |||
| @@ -31,8 +31,8 @@ enum class FileCommand : u32 { | |||
| 31 | 31 | ||
| 32 | class Archive : public Object { | 32 | class Archive : public Object { |
| 33 | public: | 33 | public: |
| 34 | const char* GetTypeName() const { return "Archive"; } | 34 | std::string GetTypeName() const { return "Archive"; } |
| 35 | const char* GetName() const { return name.c_str(); } | 35 | std::string GetName() const { return name; } |
| 36 | 36 | ||
| 37 | static Kernel::HandleType GetStaticHandleType() { return HandleType::Archive; } | 37 | static Kernel::HandleType GetStaticHandleType() { return HandleType::Archive; } |
| 38 | Kernel::HandleType GetHandleType() const { return HandleType::Archive; } | 38 | Kernel::HandleType GetHandleType() const { return HandleType::Archive; } |
| @@ -110,7 +110,7 @@ Result MountArchive(Archive* archive) { | |||
| 110 | return -1; | 110 | return -1; |
| 111 | } | 111 | } |
| 112 | g_archive_map[id_code] = archive->GetHandle(); | 112 | g_archive_map[id_code] = archive->GetHandle(); |
| 113 | INFO_LOG(KERNEL, "Mounted archive %s", archive->GetName()); | 113 | INFO_LOG(KERNEL, "Mounted archive %s", archive->GetName().c_str()); |
| 114 | return 0; | 114 | return 0; |
| 115 | } | 115 | } |
| 116 | 116 | ||