mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +01:00
Code Issues Releases Wiki Activity

Replace 0 and NULL with nullptr (#7827)

Browse Source
This commit is contained in:
Hielke Morsink
2018-07-25 22:49:20 +02:00
committed by GitHub
parent 80f67247dc
commit 0b03464186
10 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/util/Util.cpp
View File

@@ -484,20 +484,20 @@ char* strcasestr(const char* haystack, const char* needle)
{
const char* p1 = haystack;
const char* p2 = needle;
const char* r = *p2 == 0 ? haystack : 0;
const char* r = *p2 == 0 ? haystack : nullptr;
while (*p1 != 0 && *p2 != 0)
{
if (tolower((unsigned char)*p1) == tolower((unsigned char)*p2))
{
if (r == 0)
if (r == nullptr)
r = p1;
p2++;
}
else
{
p2 = needle;
if (r != 0)
if (r != nullptr)
p1 = r + 1;
if (tolower((unsigned char)*p1) == tolower((unsigned char)*p2))
@@ -507,14 +507,14 @@ char* strcasestr(const char* haystack, const char* needle)
}
else
{
r = 0;
r = nullptr;
}
}
p1++;
}
return *p2 == 0 ? (char*)r : 0;
return *p2 == 0 ? (char*)r : nullptr;
}
#endif