diff options
| author | 2014-12-03 12:57:57 -0600 | |
|---|---|---|
| committer | 2014-12-03 12:57:57 -0600 | |
| commit | 8a624239703c046d89ebeaf3ea13c87af75b550f (patch) | |
| tree | 19546d2b06c71add6140f322a8aab0c918bbd9ca /src/common/string_util.cpp | |
| parent | Merge pull request #236 from rohit-n/sign-compare (diff) | |
| download | yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.tar.gz yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.tar.xz yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.zip | |
Change NULLs to nullptrs.
Diffstat (limited to 'src/common/string_util.cpp')
| -rw-r--r-- | src/common/string_util.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index dcec9275f..7fb7ede5e 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp | |||
| @@ -31,7 +31,7 @@ std::string ToUpper(std::string str) { | |||
| 31 | // faster than sscanf | 31 | // faster than sscanf |
| 32 | bool AsciiToHex(const char* _szValue, u32& result) | 32 | bool AsciiToHex(const char* _szValue, u32& result) |
| 33 | { | 33 | { |
| 34 | char *endptr = NULL; | 34 | char *endptr = nullptr; |
| 35 | const u32 value = strtoul(_szValue, &endptr, 16); | 35 | const u32 value = strtoul(_szValue, &endptr, 16); |
| 36 | 36 | ||
| 37 | if (!endptr || *endptr) | 37 | if (!endptr || *endptr) |
| @@ -69,7 +69,7 @@ bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list ar | |||
| 69 | // will be present in the middle of a multibyte sequence. | 69 | // will be present in the middle of a multibyte sequence. |
| 70 | // | 70 | // |
| 71 | // This is why we lookup an ANSI (cp1252) locale here and use _vsnprintf_l. | 71 | // This is why we lookup an ANSI (cp1252) locale here and use _vsnprintf_l. |
| 72 | static locale_t c_locale = NULL; | 72 | static locale_t c_locale = nullptr; |
| 73 | if (!c_locale) | 73 | if (!c_locale) |
| 74 | c_locale = _create_locale(LC_ALL, ".1252"); | 74 | c_locale = _create_locale(LC_ALL, ".1252"); |
| 75 | writtenCount = _vsnprintf_l(out, outsize, format, c_locale, args); | 75 | writtenCount = _vsnprintf_l(out, outsize, format, c_locale, args); |
| @@ -92,7 +92,7 @@ bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list ar | |||
| 92 | std::string StringFromFormat(const char* format, ...) | 92 | std::string StringFromFormat(const char* format, ...) |
| 93 | { | 93 | { |
| 94 | va_list args; | 94 | va_list args; |
| 95 | char *buf = NULL; | 95 | char *buf = nullptr; |
| 96 | #ifdef _WIN32 | 96 | #ifdef _WIN32 |
| 97 | int required = 0; | 97 | int required = 0; |
| 98 | 98 | ||
| @@ -162,7 +162,7 @@ std::string StripQuotes(const std::string& s) | |||
| 162 | 162 | ||
| 163 | bool TryParse(const std::string &str, u32 *const output) | 163 | bool TryParse(const std::string &str, u32 *const output) |
| 164 | { | 164 | { |
| 165 | char *endptr = NULL; | 165 | char *endptr = nullptr; |
| 166 | 166 | ||
| 167 | // Reset errno to a value other than ERANGE | 167 | // Reset errno to a value other than ERANGE |
| 168 | errno = 0; | 168 | errno = 0; |