ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct ampersands as well

This commit is contained in:
mathieui 2016-01-21 21:27:56 +01:00
parent 3e283ea9f1
commit f15ffda5a7
17 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Arm64Emitter.cpp
View File

@ -1097,7 +1097,7 @@ void ARM64XEmitter::_MSR(PStateField field, u8 imm)
EncodeSystemInst(0, op1, 4, imm, op2, WSP);
}
static void GetSystemReg(PStateField field, int &o0, int &op1, int &CRn, int &CRm, int &op2)
static void GetSystemReg(PStateField field, int& o0, int& op1, int& CRn, int& CRm, int& op2)
{
switch (field)
{

38
Source/Core/Common/FileUtil.cpp
View File

@ -58,7 +58,7 @@ namespace File
// Remove any ending forward slashes from directory paths
// Modifies argument.
static void StripTailDirSlashes(std::string &fname)
static void StripTailDirSlashes(std::string& fname)
{
if (fname.length() > 1)
{
@ -68,7 +68,7 @@ static void StripTailDirSlashes(std::string &fname)
}
// Returns true if file filename exists
bool Exists(const std::string &filename)
bool Exists(const std::string& filename)
{
struct stat64 file_info;
@ -85,7 +85,7 @@ bool Exists(const std::string &filename)
}
// Returns true if filename is a directory
bool IsDirectory(const std::string &filename)
bool IsDirectory(const std::string& filename)
{
struct stat64 file_info;
@ -110,7 +110,7 @@ bool IsDirectory(const std::string &filename)
// Deletes a given filename, return true on success
// Doesn't supports deleting a directory
bool Delete(const std::string &filename)
bool Delete(const std::string& filename)
{
INFO_LOG(COMMON, "Delete: file %s", filename.c_str());
@ -149,7 +149,7 @@ bool Delete(const std::string &filename)
}
// Returns true if successful, or path already exists.
bool CreateDir(const std::string &path)
bool CreateDir(const std::string& path)
{
INFO_LOG(COMMON, "CreateDir: directory %s", path.c_str());
#ifdef _WIN32
@ -181,7 +181,7 @@ bool CreateDir(const std::string &path)
}
// Creates the full path of fullPath returns true on success
bool CreateFullPath(const std::string &fullPath)
bool CreateFullPath(const std::string& fullPath)
{
int panicCounter = 100;
INFO_LOG(COMMON, "CreateFullPath: path %s", fullPath.c_str());
@ -220,7 +220,7 @@ bool CreateFullPath(const std::string &fullPath)
// Deletes a directory filename, returns true on success
bool DeleteDir(const std::string &filename)
bool DeleteDir(const std::string& filename)
{
INFO_LOG(COMMON, "DeleteDir: directory %s", filename.c_str());
@ -244,7 +244,7 @@ bool DeleteDir(const std::string &filename)
}
// renames file srcFilename to destFilename, returns true on success
bool Rename(const std::string &srcFilename, const std::string &destFilename)
bool Rename(const std::string& srcFilename, const std::string& destFilename)
{
INFO_LOG(COMMON, "Rename: %s --> %s",
srcFilename.c_str(), destFilename.c_str());
@ -282,7 +282,7 @@ static void FSyncPath(const char* path)
}
#endif
bool RenameSync(const std::string &srcFilename, const std::string &destFilename)
bool RenameSync(const std::string& srcFilename, const std::string& destFilename)
{
if (!Rename(srcFilename, destFilename))
return false;
@ -306,7 +306,7 @@ bool RenameSync(const std::string &srcFilename, const std::string &destFilename)
}
// copies file srcFilename to destFilename, returns true on success
bool Copy(const std::string &srcFilename, const std::string &destFilename)
bool Copy(const std::string& srcFilename, const std::string& destFilename)
{
INFO_LOG(COMMON, "Copy: %s --> %s",
srcFilename.c_str(), destFilename.c_str());
@ -372,7 +372,7 @@ bool Copy(const std::string &srcFilename, const std::string &destFilename)
}
// Returns the size of filename (64bit)
u64 GetSize(const std::string &filename)
u64 GetSize(const std::string& filename)
{
if (!Exists(filename))
{
@ -440,7 +440,7 @@ u64 GetSize(FILE* f)
}
// creates an empty file filename, returns true on success
bool CreateEmptyFile(const std::string &filename)
bool CreateEmptyFile(const std::string& filename)
{
INFO_LOG(COMMON, "CreateEmptyFile: %s", filename.c_str());
@ -457,7 +457,7 @@ bool CreateEmptyFile(const std::string &filename)
// Scans the directory tree gets, starting from _Directory and adds the
// results into parentEntry. Returns the number of files+directories found
FSTEntry ScanDirectoryTree(const std::string &directory, bool recursive)
FSTEntry ScanDirectoryTree(const std::string& directory, bool recursive)
{
INFO_LOG(COMMON, "ScanDirectoryTree: directory %s", directory.c_str());
// How many files + directories we found
@ -527,7 +527,7 @@ FSTEntry ScanDirectoryTree(const std::string &directory, bool recursive)
// Deletes the given directory and anything under it. Returns true on success.
bool DeleteDirRecursively(const std::string &directory)
bool DeleteDirRecursively(const std::string& directory)
{
INFO_LOG(COMMON, "DeleteDirRecursively: %s", directory.c_str());
#ifdef _WIN32
@ -600,7 +600,7 @@ bool DeleteDirRecursively(const std::string &directory)
}
// Create directory and copy contents (does not overwrite existing files)
void CopyDir(const std::string &source_path, const std::string &dest_path)
void CopyDir(const std::string& source_path, const std::string& dest_path)
{
if (source_path == dest_path) return;
if (!File::Exists(source_path)) return;
@ -666,7 +666,7 @@ std::string GetCurrentDir()
}
// Sets the current directory to the given directory
bool SetCurrentDir(const std::string &directory)
bool SetCurrentDir(const std::string& directory)
{
return __chdir(directory.c_str()) == 0;
}
@ -697,7 +697,7 @@ std::string CreateTempDir()
#endif
}
std::string GetTempFilenameForAtomicWrite(const std::string &path)
std::string GetTempFilenameForAtomicWrite(const std::string& path)
{
std::string abs = path;
#ifdef _WIN32
@ -883,12 +883,12 @@ std::string GetThemeDir(const std::string& theme_name)
return dir;
}
bool WriteStringToFile(const std::string &str, const std::string& filename)
bool WriteStringToFile(const std::string& str, const std::string& filename)
{
return File::IOFile(filename, "wb").WriteBytes(str.data(), str.size());
}
bool ReadFileToString(const std::string& filename, std::string &str)
bool ReadFileToString(const std::string& filename, std::string& str)
{
File::IOFile file(filename, "rb");
auto const f = file.GetHandle();

34
Source/Core/Common/FileUtil.h
View File

@ -70,13 +70,13 @@ struct FSTEntry
};
// Returns true if file filename exists
bool Exists(const std::string &filename);
bool Exists(const std::string& filename);
// Returns true if filename is a directory
bool IsDirectory(const std::string &filename);
bool IsDirectory(const std::string& filename);
// Returns the size of filename (64bit)
u64 GetSize(const std::string &filename);
u64 GetSize(const std::string& filename);
// Overloaded GetSize, accepts file descriptor
u64 GetSize(const int fd);
@ -85,50 +85,50 @@ u64 GetSize(const int fd);
u64 GetSize(FILE* f);
// Returns true if successful, or path already exists.
bool CreateDir(const std::string &filename);
bool CreateDir(const std::string& filename);
// Creates the full path of fullPath returns true on success
bool CreateFullPath(const std::string &fullPath);
bool CreateFullPath(const std::string& fullPath);
// Deletes a given filename, return true on success
// Doesn't supports deleting a directory
bool Delete(const std::string &filename);
bool Delete(const std::string& filename);
// Deletes a directory filename, returns true on success
bool DeleteDir(const std::string &filename);
bool DeleteDir(const std::string& filename);
// renames file srcFilename to destFilename, returns true on success
bool Rename(const std::string &srcFilename, const std::string &destFilename);
bool Rename(const std::string& srcFilename, const std::string& destFilename);
// ditto, but syncs the source file and, on Unix, syncs the directories after rename
bool RenameSync(const std::string &srcFilename, const std::string &destFilename);
bool RenameSync(const std::string& srcFilename, const std::string& destFilename);
// copies file srcFilename to destFilename, returns true on success
bool Copy(const std::string &srcFilename, const std::string &destFilename);
bool Copy(const std::string& srcFilename, const std::string& destFilename);
// creates an empty file filename, returns true on success
bool CreateEmptyFile(const std::string &filename);
bool CreateEmptyFile(const std::string& filename);
// Recursive or non-recursive list of files under directory.
FSTEntry ScanDirectoryTree(const std::string &directory, bool recursive);
FSTEntry ScanDirectoryTree(const std::string& directory, bool recursive);
// deletes the given directory and anything under it. Returns true on success.
bool DeleteDirRecursively(const std::string &directory);
bool DeleteDirRecursively(const std::string& directory);
// Returns the current directory
std::string GetCurrentDir();
// Create directory and copy contents (does not overwrite existing files)
void CopyDir(const std::string &source_path, const std::string &dest_path);
void CopyDir(const std::string& source_path, const std::string& dest_path);
// Set the current directory to given directory
bool SetCurrentDir(const std::string &directory);
bool SetCurrentDir(const std::string& directory);
// Creates and returns the path to a new temporary directory.
std::string CreateTempDir();
// Get a filename that can hopefully be atomically renamed to the given path.
std::string GetTempFilenameForAtomicWrite(const std::string &path);
std::string GetTempFilenameForAtomicWrite(const std::string& path);
// Gets a set user directory path
// Don't call prior to setting the base user directory
@ -148,7 +148,7 @@ std::string GetSysDirectory();
std::string GetBundleDirectory();
#endif
std::string &GetExeDirectory();
std::string& GetExeDirectory();
bool WriteStringToFile(const std::string& str, const std::string& filename);
bool ReadFileToString(const std::string& filename, std::string& str);

8
Source/Core/Common/FixedSizeQueue.h
View File

@ -22,7 +22,7 @@ class FixedSizeQueue
int count; // sacrifice 4 bytes for a simpler implementation. may optimize away in the future.
// Make copy constructor private for now.
FixedSizeQueue(FixedSizeQueue &other) {}
FixedSizeQueue(FixedSizeQueue& other) {}
public:
FixedSizeQueue()
@ -62,13 +62,13 @@ public:
T pop_front()
{
const T &temp = storage[head];
const T& temp = storage[head];
pop();
return temp;
}
T &front() { return storage[head]; }
const T &front() const { return storage[head]; }
T& front() { return storage[head]; }
const T& front() const { return storage[head]; }
size_t size() const
{

4
Source/Core/Common/LinearDiskCache.h
View File

@ -31,7 +31,7 @@ template <typename K, typename V>
class LinearDiskCacheReader
{
public:
virtual void Read(const K &key, const V* value, u32 value_size) = 0;
virtual void Read(const K& key, const V* value, u32 value_size) = 0;
};
// Dead simple unsorted key-value store with append functionality.
@ -142,7 +142,7 @@ public:
}
// Appends a key-value pair to the store.
void Append(const K &key, const V* value, u32 value_size)
void Append(const K& key, const V* value, u32 value_size)
{
// TODO: Should do a check that we don't already have "key"? (I think each caller does that already.)
Write(&value_size);

22
Source/Core/Common/MathUtil.cpp
View File

@ -265,7 +265,7 @@ float MathFloatVectorSum(const std::vector<float>& Vec)
return std::accumulate(Vec.begin(), Vec.end(), 0.0f);
}
void Matrix33::LoadIdentity(Matrix33 &mtx)
void Matrix33::LoadIdentity(Matrix33& mtx)
{
memset(mtx.data, 0, sizeof(mtx.data));
mtx.data[0] = 1.0f;
@ -273,7 +273,7 @@ void Matrix33::LoadIdentity(Matrix33 &mtx)
mtx.data[8] = 1.0f;
}
void Matrix33::RotateX(Matrix33 &mtx, float rad)
void Matrix33::RotateX(Matrix33& mtx, float rad)
{
float s = sin(rad);
float c = cos(rad);
@ -284,7 +284,7 @@ void Matrix33::RotateX(Matrix33 &mtx, float rad)
mtx.data[7] = s;
mtx.data[8] = c;
}
void Matrix33::RotateY(Matrix33 &mtx, float rad)
void Matrix33::RotateY(Matrix33& mtx, float rad)
{
float s = sin(rad);
float c = cos(rad);
@ -296,12 +296,12 @@ void Matrix33::RotateY(Matrix33 &mtx, float rad)
mtx.data[8] = c;
}
void Matrix33::Multiply(const Matrix33 &a, const Matrix33 &b, Matrix33 &result)
void Matrix33::Multiply(const Matrix33& a, const Matrix33& b, Matrix33& result)
{
MatrixMul(3, a.data, b.data, result.data);
}
void Matrix33::Multiply(const Matrix33 &a, const float vec[3], float result[3])
void Matrix33::Multiply(const Matrix33& a, const float vec[3], float result[3])
{
for (int i = 0; i < 3; ++i)
{
@ -314,7 +314,7 @@ void Matrix33::Multiply(const Matrix33 &a, const float vec[3], float result[3])
}
}
void Matrix44::LoadIdentity(Matrix44 &mtx)
void Matrix44::LoadIdentity(Matrix44& mtx)
{
memset(mtx.data, 0, sizeof(mtx.data));
mtx.data[0] = 1.0f;
@ -323,7 +323,7 @@ void Matrix44::LoadIdentity(Matrix44 &mtx)
mtx.data[15] = 1.0f;
}
void Matrix44::LoadMatrix33(Matrix44 &mtx, const Matrix33 &m33)
void Matrix44::LoadMatrix33(Matrix44& mtx, const Matrix33& m33)
{
for (int i = 0; i < 3; ++i)
{
@ -341,7 +341,7 @@ void Matrix44::LoadMatrix33(Matrix44 &mtx, const Matrix33 &m33)
mtx.data[15] = 1.0f;
}
void Matrix44::Set(Matrix44 &mtx, const float mtxArray[16])
void Matrix44::Set(Matrix44& mtx, const float mtxArray[16])
{
for (int i = 0; i < 16; ++i)
{
@ -349,7 +349,7 @@ void Matrix44::Set(Matrix44 &mtx, const float mtxArray[16])
}
}
void Matrix44::Translate(Matrix44 &mtx, const float vec[3])
void Matrix44::Translate(Matrix44& mtx, const float vec[3])
{
LoadIdentity(mtx);
mtx.data[3] = vec[0];
@ -357,14 +357,14 @@ void Matrix44::Translate(Matrix44 &mtx, const float vec[3])
mtx.data[11] = vec[2];
}
void Matrix44::Shear(Matrix44 &mtx, const float a, const float b)
void Matrix44::Shear(Matrix44& mtx, const float a, const float b)
{
LoadIdentity(mtx);
mtx.data[2] = a;
mtx.data[6] = b;
}
void Matrix44::Multiply(const Matrix44 &a, const Matrix44 &b, Matrix44 &result)
void Matrix44::Multiply(const Matrix44& a, const Matrix44& b, Matrix44& result)
{
MatrixMul(4, a.data, b.data, result.data);
}

22
Source/Core/Common/MathUtil.h
View File

@ -192,16 +192,16 @@ inline int IntLog2(u64 val)
class Matrix33
{
public:
static void LoadIdentity(Matrix33 &mtx);
static void LoadIdentity(Matrix33& mtx);
// set mtx to be a rotation matrix around the x axis
static void RotateX(Matrix33 &mtx, float rad);
static void RotateX(Matrix33& mtx, float rad);
// set mtx to be a rotation matrix around the y axis
static void RotateY(Matrix33 &mtx, float rad);
static void RotateY(Matrix33& mtx, float rad);
// set result = a x b
static void Multiply(const Matrix33 &a, const Matrix33 &b, Matrix33 &result);
static void Multiply(const Matrix33 &a, const float vec[3], float result[3]);
static void Multiply(const Matrix33& a, const Matrix33& b, Matrix33& result);
static void Multiply(const Matrix33& a, const float vec[3], float result[3]);
float data[9];
};
@ -209,14 +209,14 @@ public:
class Matrix44
{
public:
static void LoadIdentity(Matrix44 &mtx);
static void LoadMatrix33(Matrix44 &mtx, const Matrix33 &m33);
static void Set(Matrix44 &mtx, const float mtxArray[16]);
static void LoadIdentity(Matrix44& mtx);
static void LoadMatrix33(Matrix44& mtx, const Matrix33& m33);
static void Set(Matrix44& mtx, const float mtxArray[16]);
static void Translate(Matrix44 &mtx, const float vec[3]);
static void Shear(Matrix44 &mtx, const float a, const float b = 0);
static void Translate(Matrix44& mtx, const float vec[3]);
static void Shear(Matrix44& mtx, const float a, const float b = 0);
static void Multiply(const Matrix44 &a, const Matrix44 &b, Matrix44 &result);
static void Multiply(const Matrix44& a, const Matrix44& b, Matrix44& result);
float data[16];
};

2
Source/Core/Common/NandPaths.cpp
View File

@ -118,7 +118,7 @@ bool CheckTitleTIK(u64 _titleID, FromWhichRoot from)
return false;
}
static void CreateReplacementFile(std::string &filename)
static void CreateReplacementFile(std::string& filename)
{
std::ofstream replace;
OpenFStream(replace, filename, std::ios_base::out);

8
Source/Core/Common/StringUtil.cpp
View File

@ -167,7 +167,7 @@ std::string ArrayToString(const u8* data, u32 size, int line_len, bool spaces)
}
// Turns " hej " into "hej". Also handles tabs.
std::string StripSpaces(const std::string &str)
std::string StripSpaces(const std::string& str)
{
const size_t s = str.find_first_not_of(" \t\r\n");
@ -188,7 +188,7 @@ std::string StripQuotes(const std::string& s)
return s;
}
bool TryParse(const std::string &str, u32* const output)
bool TryParse(const std::string& str, u32* const output)
{
char* endptr = nullptr;
@ -213,7 +213,7 @@ bool TryParse(const std::string &str, u32* const output)
return true;
}
bool TryParse(const std::string &str, bool* const output)
bool TryParse(const std::string& str, bool* const output)
{
if ("1" == str || !strcasecmp("true", str.c_str()))
*output = true;
@ -292,7 +292,7 @@ void SplitString(const std::string& str, const char delim, std::vector<std::stri
output.pop_back();
}
std::string TabsToSpaces(int tab_size, const std::string &in)
std::string TabsToSpaces(int tab_size, const std::string& in)
{
const std::string spaces(tab_size, ' ');
std::string out(in);

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

@ -38,8 +38,8 @@ inline void CharArrayFromFormat(char (& out)[Count], const char* format, ...)
// Good
std::string ArrayToString(const u8* data, u32 size, int line_len = 20, bool spaces = true);
std::string StripSpaces(const std::string &s);
std::string StripQuotes(const std::string &s);
std::string StripSpaces(const std::string& s);
std::string StripQuotes(const std::string& s);
// Thousand separator. Turns 12345678 into 12,345,678
template <typename I>
@ -59,11 +59,11 @@ std::string ThousandSeparate(I value, int spaces = 0)
std::string StringFromInt(int value);
std::string StringFromBool(bool value);
bool TryParse(const std::string &str, bool* output);
bool TryParse(const std::string &str, u32* output);
bool TryParse(const std::string& str, bool* output);
bool TryParse(const std::string& str, u32* output);
template <typename N>
static bool TryParse(const std::string &str, N* const output)
static bool TryParse(const std::string& str, N* const output)
{
std::istringstream iss(str);
// is this right? not doing this breaks reading floats on locales that use different decimal separators
@ -99,7 +99,7 @@ bool TryParseVector(const std::string& str, std::vector<N>* output, const char d
// TODO: kill this
bool AsciiToHex(const std::string& _szValue, u32& result);
std::string TabsToSpaces(int tab_size, const std::string &in);
std::string TabsToSpaces(int tab_size, const std::string& in);
void SplitString(const std::string& str, char delim, std::vector<std::string>& output);

2
Source/Core/Common/SymbolDB.cpp
View File

@ -50,7 +50,7 @@ Symbol* SymbolDB::GetSymbolFromName(const std::string& name)
return nullptr;
}
void SymbolDB::AddCompleteSymbol(const Symbol &symbol)
void SymbolDB::AddCompleteSymbol(const Symbol& symbol)
{
functions.emplace(symbol.address, symbol);
}

6
Source/Core/Common/SymbolDB.h
View File

@ -82,7 +82,7 @@ public:
virtual Symbol* GetSymbolFromAddr(u32 addr) { return nullptr; }
virtual Symbol* AddFunction(u32 startAddr) { return nullptr; }
void AddCompleteSymbol(const Symbol &symbol);
void AddCompleteSymbol(const Symbol& symbol);
Symbol* GetSymbolFromName(const std::string& name);
Symbol* GetSymbolFromHash(u32 hash)
@ -94,8 +94,8 @@ public:
return nullptr;
}
const XFuncMap &Symbols() const { return functions; }
XFuncMap &AccessSymbols() { return functions; }
const XFuncMap& Symbols() const { return functions; }
XFuncMap& AccessSymbols() { return functions; }
void Clear(const char* prefix = "");
void List();

2
Source/Core/Common/SysConf.cpp
View File

@ -162,7 +162,7 @@ bool SysConf::LoadFromFileInternal(FILE* fh)
}
// Returns the size of the item in file
static unsigned int create_item(SSysConfEntry &item, SysconfType type, const std::string &name,
static unsigned int create_item(SSysConfEntry& item, SysconfType type, const std::string& name,
const int data_length, unsigned int offset)
{
item.offset = offset;

2
Source/Core/Common/ucrtFreadWorkaround.cpp
View File

@ -23,7 +23,7 @@ struct PatchInfo {
{ L"ucrtbased.dll", 0x1C1915 , 0x91905, 5 },
};
bool ApplyPatch(const PatchInfo &patch) {
bool ApplyPatch(const PatchInfo& patch) {
auto module = GetModuleHandleW(patch.module_name);
if (module == nullptr)
{

4
Source/Core/Common/x64ABI.cpp
View File

@ -217,7 +217,7 @@ void XEmitter::MOVTwo(int bits, Gen::X64Reg dst1, Gen::X64Reg src1, s32 offset1,
}
}
void XEmitter::ABI_CallFunctionAC(int bits, const void* func, const Gen::OpArg &arg1, u32 param2)
void XEmitter::ABI_CallFunctionAC(int bits, const void* func, const Gen::OpArg& arg1, u32 param2)
{
if (!arg1.IsSimpleReg(ABI_PARAM1))
MOV(bits, R(ABI_PARAM1), arg1);
@ -225,7 +225,7 @@ void XEmitter::ABI_CallFunctionAC(int bits, const void* func, const Gen::OpArg &
ABI_CallFunction(func);
}
void XEmitter::ABI_CallFunctionA(int bits, const void* func, const Gen::OpArg &arg1)
void XEmitter::ABI_CallFunctionA(int bits, const void* func, const Gen::OpArg& arg1)
{
if (!arg1.IsSimpleReg(ABI_PARAM1))
MOV(bits, R(ABI_PARAM1), arg1);

2
Source/Core/Common/x64Analyzer.cpp
View File

@ -224,7 +224,7 @@ bool DisassembleMov(const unsigned char* codePtr, InstructionInfo* info)
return true;
}
bool InstructionInfo::operator==(const InstructionInfo &other) const
bool InstructionInfo::operator==(const InstructionInfo& other) const
{
return operandSize == other.operandSize &&
instructionSize == other.instructionSize &&

2
Source/Core/Common/x64Analyzer.h
View File

@ -21,7 +21,7 @@ struct InstructionInfo
u64 immediate;
s32 displacement;
bool operator==(const InstructionInfo &other) const;
bool operator==(const InstructionInfo& other) const;
};
struct ModRM