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

[Common] Fix some warnings

This commit is contained in:
zilmar 2016-11-28 07:23:12 +11:00
parent a6167b5bb0
commit ebaee14229
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Common/MemoryManagement.cpp
View File

@ -70,6 +70,7 @@ bool FreeAddressSpace(void* addr, size_t size)
#else
msync(addr, size, MS_SYNC);
munmap(addr, size);
return true;
#endif
}

1
Source/Common/SyncEvent.cpp
View File

@ -52,6 +52,7 @@ bool SyncEvent::IsTriggered(int32_t iWaitTime)
}
m_signalled = false;
pthread_mutex_unlock((pthread_mutex_t*)m_Event);
return true;
#endif
}

10
Source/Common/path.cpp
View File

@ -606,7 +606,7 @@ void CPath::SetComponents(const char * lpszDirectory, const char * lpszName, con
if (lpszDirectory != NULL && lpszDirectory[0] != '\0')
{
if (lpszDirectory[0] != DIRECTORY_DELIMITER) { buff_fullname[0] = DIRECTORY_DELIMITER; }
strncat(buff_fullname,lpszDirectory,sizeof(buff_fullname));
strncat(buff_fullname,lpszDirectory,sizeof(buff_fullname) - 1);
std::string::size_type nLength = strlen(buff_fullname);
if (buff_fullname[nLength - 1] != DIRECTORY_DELIMITER && nLength < sizeof(buff_fullname))
{
@ -615,15 +615,15 @@ void CPath::SetComponents(const char * lpszDirectory, const char * lpszName, con
}
if (lpszName != NULL)
{
strncat(buff_fullname,lpszName,sizeof(buff_fullname));
strncat(buff_fullname,lpszName,sizeof(buff_fullname) - 1);
}
if (lpszExtension != NULL && lpszExtension[0] != '\0')
{
if (lpszExtension[0] != '.')
{
strncat(buff_fullname,".",sizeof(buff_fullname));
strncat(buff_fullname,".",sizeof(buff_fullname)-1);
}
strncat(buff_fullname,lpszExtension,sizeof(buff_fullname));
strncat(buff_fullname,lpszExtension,sizeof(buff_fullname)-1);
}
buff_fullname[sizeof(buff_fullname) - 1] = 0; //Make sure it is null terminated
m_strPath.erase();
@ -1331,7 +1331,7 @@ bool CPath::FindNext()
}
#else
dirent* pEntry;
while (pEntry = readdir((DIR*)m_OpenedDir))
while ((pEntry = readdir((DIR*)m_OpenedDir)))
{
uint32_t dwFileAttributes = pEntry->d_type == DT_DIR ? FIND_ATTRIBUTE_SUBDIR : FIND_ATTRIBUTE_FILES;