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

Google code style, add a warning if no sd

This commit is contained in:
Isaac Connor 2017-10-19 16:08:20 -04:00
parent 9ad29f4baf
commit e0d99018aa
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/zm_stream.cpp
View File

@ -77,17 +77,13 @@ void StreamBase::updateFrameRate( double fps )
Debug( 3, "aEFPS:%.2f, aFM:%d", effective_fps, frame_mod ); Debug( 3, "aEFPS:%.2f, aFM:%d", effective_fps, frame_mod );
} }
bool StreamBase::checkCommandQueue() bool StreamBase::checkCommandQueue() {
{ if ( sd >= 0 ) {
if ( sd >= 0 )
{
CmdMsg msg; CmdMsg msg;
memset( &msg, 0, sizeof(msg) ); memset( &msg, 0, sizeof(msg) );
int nbytes = recvfrom( sd, &msg, sizeof(msg), MSG_DONTWAIT, 0, 0 ); int nbytes = recvfrom( sd, &msg, sizeof(msg), MSG_DONTWAIT, 0, 0 );
if ( nbytes < 0 ) if ( nbytes < 0 ) {
{ if ( errno != EAGAIN ) {
if ( errno != EAGAIN )
{
Fatal( "recvfrom(), errno = %d, error = %s", errno, strerror(errno) ); Fatal( "recvfrom(), errno = %d, error = %s", errno, strerror(errno) );
} }
} }
@ -95,11 +91,12 @@ bool StreamBase::checkCommandQueue()
//{ //{
//Error( "Partial message received, expected %d bytes, got %d", sizeof(msg), nbytes ); //Error( "Partial message received, expected %d bytes, got %d", sizeof(msg), nbytes );
//} //}
else else {
{
processCommand( &msg ); processCommand( &msg );
return( true ); return( true );
} }
} else {
Warning("No sd in checkCommandQueue, comms not open?");
} }
return( false ); return( false );
} }