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

Merge pull request #4769 from lioncash/settingshandler

Browse Source 
SettingsHandler: Minor cleanup
This commit is contained in:
Matthew Parlane
2017-02-08 18:15:37 +13:00
committed by GitHub
parent f456fcec48 c748158182
commit dac6a66252
4 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Source/Core/Common/SettingsHandler.cpp
View File

@ -18,6 +18,7 @@
#endif
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/SettingsHandler.h"
#include "Common/Timer.h"
@ -26,9 +27,30 @@ SettingsHandler::SettingsHandler()
Reset();
}
bool SettingsHandler::Open(const std::string& settings_file_path)
{
Reset();
File::IOFile file{settings_file_path, "rb"};
if (!file.ReadBytes(m_buffer.data(), m_buffer.size()))
return false;
Decrypt();
return true;
}
bool SettingsHandler::Save(const std::string& destination_file_path) const
{
if (!File::CreateFullPath(destination_file_path))
return false;
File::IOFile file{destination_file_path, "wb"};
return file.WriteBytes(m_buffer.data(), m_buffer.size());
}
const u8* SettingsHandler::GetData() const
{
return m_buffer;
return m_buffer.data();
}
const std::string SettingsHandler::GetValue(const std::string& key)
@ -62,10 +84,10 @@ const std::string SettingsHandler::GetValue(const std::string& key)
void SettingsHandler::Decrypt()
{
const u8* str = m_buffer;
const u8* str = m_buffer.data();
while (*str != 0)
{
if (m_position >= SETTINGS_SIZE)
if (m_position >= m_buffer.size())
return;
decoded.push_back((u8)(m_buffer[m_position] ^ m_key));
m_position++;
@ -79,7 +101,7 @@ void SettingsHandler::Reset()
decoded = "";
m_position = 0;
m_key = INITIAL_SEED;
memset(m_buffer, 0, SETTINGS_SIZE);
m_buffer = {};
}
void SettingsHandler::AddSetting(const std::string& key, const std::string& value)
@ -102,7 +124,7 @@ void SettingsHandler::AddSetting(const std::string& key, const std::string& valu
void SettingsHandler::WriteByte(u8 b)
{
if (m_position >= SETTINGS_SIZE)
if (m_position >= m_buffer.size())
return;
m_buffer[m_position] = b ^ m_key;
@ -110,7 +132,7 @@ void SettingsHandler::WriteByte(u8 b)
m_key = (m_key >> 31) | (m_key << 1);
}
const std::string SettingsHandler::generateSerialNumber()
std::string SettingsHandler::GenerateSerialNumber()
{
time_t rawtime;
tm* timeinfo;

12
Source/Core/Common/SettingsHandler.h
View File

@ -6,6 +6,7 @@
#pragma once
#include <array>
#include <string>
#include "Common/CommonTypes.h"
@ -13,8 +14,6 @@
class SettingsHandler
{
public:
SettingsHandler();
enum
{
SETTINGS_SIZE = 0x100,
@ -22,6 +21,11 @@ public:
INITIAL_SEED = 0x73B5DBFA
};
SettingsHandler();
bool Open(const std::string& settings_file_path);
bool Save(const std::string& destination_file_path) const;
void AddSetting(const std::string& key, const std::string& value);
const u8* GetData() const;
@ -29,12 +33,12 @@ public:
void Decrypt();
void Reset();
const std::string generateSerialNumber();
static std::string GenerateSerialNumber();
private:
void WriteByte(u8 b);
u8 m_buffer[SETTINGS_SIZE];
std::array<u8, SETTINGS_SIZE> m_buffer;
u32 m_position, m_key;
std::string decoded;
};