ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make clang happy

This commit is contained in:
abishai 2017-02-03 14:53:53 +03:00
parent 1687217d18
commit 8d5a8f5512
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/zm_monitor.cpp
View File

@ -160,7 +160,7 @@ bool Monitor::MonitorLink::connect()
return( false );
}
mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
if ( mem_ptr < 0 )
if ( mem_ptr < (void *)0 )
{
Debug( 3, "Can't shmat link memory: %s", strerror(errno) );
connected = false;
@ -194,7 +194,7 @@ bool Monitor::MonitorLink::disconnect()
connected = false;
#if ZM_MEM_MAPPED
if ( mem_ptr > 0 )
if ( mem_ptr > (void *)0 )
{
msync( mem_ptr, mem_size, MS_ASYNC );
munmap( mem_ptr, mem_size );
@ -222,7 +222,7 @@ bool Monitor::MonitorLink::disconnect()
}
}
if ( shmdt( mem_ptr ) < 0 )
if ( shmdt( mem_ptr ) < (void *)0 )
{
Debug( 3, "Can't shmdt: %s", strerror(errno) );
return( false );
@ -558,7 +558,7 @@ bool Monitor::connect() {
exit( -1 );
}
mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
if ( mem_ptr < 0 )
if ( mem_ptr < (void *)0 )
{
Error( "Can't shmat: %s", strerror(errno));
exit( -1 );

2
src/zmf.cpp
View File

@ -331,7 +331,7 @@ int main( int argc, char *argv[] )
Debug( 1, "Got image, writing to %s", path );
FILE *fd = 0;
if ( (fd = fopen( path, "w" )) < 0 )
if ( (fd = fopen( path, "w" )) < (void *)0 )
{
Error( "Can't fopen '%s': %s", path, strerror(errno) );
exit( -1 );