mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-24 14:36:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Logging and whitespace changes. No logical changes

Browse Source
This commit is contained in:
Isaac Connor
2018-12-20 13:50:55 -05:00
parent eccfdb8a6a
commit 64bdf40e86
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
View File

@@ -246,11 +246,12 @@ sub zmMemInit {
sub zmMemVerify {
my $monitor = shift;
if ( !zmMemAttach( $monitor, $mem_size ) ) {
return( undef );
if ( !zmMemAttach($monitor, $mem_size) ) {
return undef;
}
my $sd_size = zmMemRead( $monitor, 'shared_data:size', 1 );
my $sd_size = zmMemRead($monitor, 'shared_data:size', 1);
if ( $sd_size != $mem_data->{shared_data}->{size} ) {
if ( $sd_size ) {
Error( "Shared data size conflict in shared_data for monitor "
@@ -268,9 +269,9 @@ sub zmMemVerify {
.", got ".$sd_size
);
}
return( undef );
return undef;
}
my $td_size = zmMemRead( $monitor, 'trigger_data:size', 1 );
my $td_size = zmMemRead($monitor, 'trigger_data:size', 1);
if ( $td_size != $mem_data->{trigger_data}->{size} ) {
if ( $td_size ) {
Error( "Shared data size conflict in trigger_data for monitor "
@@ -289,14 +290,17 @@ sub zmMemVerify {
.$td_size
);
}
return( undef );
return undef;
}
if ( !zmMemRead($monitor, 'shared_data:valid',1) ) {
Error( "Shared data not valid for monitor $$monitor{Id}" );
return( undef );
my $valid = zmMemRead($monitor, 'shared_data:valid',1);
if ( !$valid ) {
Error("Shared data not valid for monitor $$monitor{Id}");
return undef;
} else {
Debug("Shared data appears vaild for monitor $$monitor{Id}: $valid");
}
return( !undef );
return !undef;
}
sub zmMemRead {