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

robustness/code style changes

This commit is contained in:
Isaac Connor 2014-01-03 12:55:30 -05:00
parent 3d55dde548
commit d185f05006
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
View File

@ -76,8 +76,11 @@ sub zmMemKey( $ )
sub zmMemAttach( $$ )
{
my $monitor = shift;
my $size = shift;
my ( $monitor, $size ) = @_;
if ( ! $size ) {
Error( "No size passed to zmMemAttach for monitor $$monitor{Id}\n" );
return( undef );
}
if ( !defined($monitor->{MMapAddr}) )
{
my $mmap_file = $Config{ZM_PATH_MAP}."/zm.mmap.".$monitor->{Id};
@ -95,6 +98,7 @@ sub zmMemAttach( $$ )
if ( !$mmap_addr || !$mmap )
{
Error( sprintf( "Can't mmap to file '%s': $!\n", $mmap_file ) );
close( MMAP );
return( undef );
}
$monitor->{MMapHandle} = \*MMAP;
@ -110,7 +114,9 @@ sub zmMemDetach( $ )
if ( $monitor->{MMap} )
{
munmap( ${$monitor->{MMap}} );
if ( ! munmap( ${$monitor->{MMap}} ) ) {
Warn( "Unable to munmap for monitor $$monitor{Id}\n");
}
delete $monitor->{MMap};
}
if ( $monitor->{MMapAddr} )

5
scripts/zmtrigger.pl.in
View File

@ -437,4 +437,7 @@ sub handleMessage
{
Error( "Unrecognised action '$action' in message '$message'\n" );
}
}
} # end sub handleMessage
1;
__END__