From 78aa398e7c09adc4fb9318a4c497e8fd1bcd58ba Mon Sep 17 00:00:00 2001 From: mathieui Date: Thu, 21 Jan 2016 20:46:25 +0100 Subject: Common: asterisks go against the type name not the variable name --- Source/Core/Common/StringUtil.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/Common/StringUtil.cpp') diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 213dba2b08..afc63ca2f4 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -42,7 +42,7 @@ bool AsciiToHex(const std::string& _szValue, u32& result) // Set errno to a good state. errno = 0; - char *endptr = nullptr; + char* endptr = nullptr; const u32 value = strtoul(_szValue.c_str(), &endptr, 16); if (!endptr || *endptr) @@ -120,7 +120,7 @@ std::string StringFromFormat(const char* format, ...) std::string StringFromFormatV(const char* format, va_list args) { - char *buf = nullptr; + char* buf = nullptr; #ifdef _WIN32 int required = _vscprintf(format, args); buf = new char[required + 1]; @@ -190,7 +190,7 @@ std::string StripQuotes(const std::string& s) bool TryParse(const std::string &str, u32 *const output) { - char *endptr = nullptr; + char* endptr = nullptr; // Reset errno to a value other than ERANGE errno = 0; -- cgit v1.2.3 From 3e283ea9f17aa779832db065b2ecc4b19cf03e83 Mon Sep 17 00:00:00 2001 From: mathieui Date: Thu, 21 Jan 2016 21:16:51 +0100 Subject: More asterisks --- Source/Core/Common/StringUtil.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/Common/StringUtil.cpp') diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index afc63ca2f4..bb8ec8887c 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -145,7 +145,7 @@ std::string StringFromFormatV(const char* format, va_list args) } // For Debugging. Read out an u8 array. -std::string ArrayToString(const u8 *data, u32 size, int line_len, bool spaces) +std::string ArrayToString(const u8* data, u32 size, int line_len, bool spaces) { std::ostringstream oss; oss << std::setfill('0') << std::hex; @@ -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; -- cgit v1.2.3 From f15ffda5a7518cb87a09f301deaeffab0723ec27 Mon Sep 17 00:00:00 2001 From: mathieui Date: Thu, 21 Jan 2016 21:27:56 +0100 Subject: Correct ampersands as well --- Source/Core/Common/StringUtil.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/Core/Common/StringUtil.cpp') diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index bb8ec8887c..2eb68a944a 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -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