piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Kill off some usages of c_str.

Browse Source 
Also changes some function params, but this is ok.
Some simplifications were also able to be made (ie. killing off strcmps with ==, etc).
This commit is contained in:
Lioncash
2014-03-12 15:33:41 -04:00
parent dccc6d8b47
commit a82675b7d5
170 changed files with 812 additions and 704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DiscIO/CompressedBlob.h
View File

@ -23,7 +23,7 @@
namespace DiscIO
{
bool IsCompressedBlob(const char* filename);
bool IsCompressedBlob(const std::string& filename);
const u32 kBlobCookie = 0xB10BC001;
@ -46,23 +46,23 @@ struct CompressedBlobHeader // 32 bytes
class CompressedBlobReader : public SectorReader
{
public:
static CompressedBlobReader* Create(const char *filename);
static CompressedBlobReader* Create(const std::string& filename);
~CompressedBlobReader();
const CompressedBlobHeader &GetHeader() const { return header; }
u64 GetDataSize() const override { return header.data_size; }
u64 GetRawSize() const override { return file_size; }
u64 GetBlockCompressedSize(u64 block_num) const;
void GetBlock(u64 block_num, u8 *out_ptr) override;
void GetBlock(u64 block_num, u8* out_ptr) override;
private:
CompressedBlobReader(const char *filename);
CompressedBlobReader(const std::string& filename);
CompressedBlobHeader header;
u64 *block_pointers;
u32 *hashes;
u64* block_pointers;
u32* hashes;
int data_offset;
File::IOFile m_file;
u64 file_size;
u8 *zlib_buffer;
u8* zlib_buffer;
int zlib_buffer_size;
std::string file_name;
};