Fix for problems signaled by clang static analyzer
Former-commit-id: 835f639c45509b0d55fe716e51e3285ea2a89da4
This commit is contained in:
parent
6a583b8231
commit
db8a222f62
|
|
@ -132,7 +132,7 @@ namespace Nz
|
|||
else
|
||||
difference = sequence - sequence2;
|
||||
|
||||
return 0;
|
||||
return difference;
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
|
|||
|
|
@ -143,7 +143,18 @@ namespace Nz
|
|||
return false;
|
||||
}
|
||||
|
||||
mode_t permissions; // TODO : get permission from first file
|
||||
mode_t permissions;
|
||||
struct stat sb;
|
||||
if (fstat(fd1, &sb) == -1) // get permission from first file
|
||||
{
|
||||
NazaraWarning("Could not get permissions of source file");
|
||||
permissions = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
|
||||
}
|
||||
else
|
||||
{
|
||||
permissions = sb.st_mode & ~S_IFMT; // S_IFMT: bit mask for the file type bit field -> ~S_IFMT: general permissions
|
||||
}
|
||||
|
||||
int fd2 = open64(targetPath.GetConstBuffer(), O_WRONLY | O_TRUNC, permissions);
|
||||
if (fd2 == -1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2827,21 +2827,15 @@ namespace Nz
|
|||
{
|
||||
const char* c = oldCharacters;
|
||||
char character = Detail::ToLower(*ptr);
|
||||
bool found = false;
|
||||
|
||||
std::ptrdiff_t offset = ptr - m_sharedString->string.get();
|
||||
EnsureOwnership();
|
||||
ptr = &m_sharedString->string[offset];
|
||||
|
||||
do
|
||||
{
|
||||
if (character == Detail::ToLower(*c))
|
||||
{
|
||||
if (!found)
|
||||
{
|
||||
std::ptrdiff_t offset = ptr - m_sharedString->string.get();
|
||||
|
||||
EnsureOwnership();
|
||||
|
||||
ptr = &m_sharedString->string[offset];
|
||||
found = true;
|
||||
}
|
||||
|
||||
*ptr = replaceCharacter;
|
||||
++count;
|
||||
break;
|
||||
|
|
@ -2853,19 +2847,12 @@ namespace Nz
|
|||
}
|
||||
else
|
||||
{
|
||||
bool found = false;
|
||||
std::ptrdiff_t offset = ptr - m_sharedString->string.get();
|
||||
EnsureOwnership();
|
||||
ptr = &m_sharedString->string[offset];
|
||||
|
||||
while ((ptr = std::strpbrk(ptr, oldCharacters)) != nullptr)
|
||||
{
|
||||
if (!found)
|
||||
{
|
||||
std::ptrdiff_t offset = ptr - m_sharedString->string.get();
|
||||
|
||||
EnsureOwnership();
|
||||
|
||||
ptr = &m_sharedString->string[offset];
|
||||
found = true;
|
||||
}
|
||||
|
||||
*ptr++ = replaceCharacter;
|
||||
++count;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -464,7 +464,6 @@ namespace Nz
|
|||
void DepthRenderTechnique::DrawOpaqueModels(const SceneData& sceneData, ForwardRenderQueue::Layer& layer) const
|
||||
{
|
||||
const Shader* lastShader = nullptr;
|
||||
const ShaderUniforms* shaderUniforms = nullptr;
|
||||
|
||||
for (auto& matIt : layer.opaqueModels)
|
||||
{
|
||||
|
|
@ -488,7 +487,7 @@ namespace Nz
|
|||
if (shader != lastShader)
|
||||
{
|
||||
// Index of uniforms in the shader
|
||||
shaderUniforms = GetShaderUniforms(shader);
|
||||
GetShaderUniforms(shader);
|
||||
lastShader = shader;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -122,5 +122,25 @@ SCENARIO("String", "[CORE][STRING]")
|
|||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
GIVEN("A string")
|
||||
{
|
||||
Nz::String replaceAny("abapeilomuky");
|
||||
Nz::String replaceAnyWithCase("abapEilOmuky");
|
||||
|
||||
WHEN("We replace any of vowels after character 3")
|
||||
{
|
||||
unsigned int nbrOfChanges = replaceAny.ReplaceAny("aeiouy", '$', 3);
|
||||
unsigned int nbrOfChangesWithCase = replaceAnyWithCase.ReplaceAny("AEIOUY", '$', 3);
|
||||
|
||||
THEN("These results are expected")
|
||||
{
|
||||
REQUIRE(replaceAny == "abap$$l$m$k$");
|
||||
REQUIRE(nbrOfChanges == 5);
|
||||
REQUIRE(replaceAnyWithCase == "abap$il$muky");
|
||||
REQUIRE(nbrOfChangesWithCase == 2);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue