From eccfdb8a6a87e0fd487d14a051ec2450be1032ea Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 20 Dec 2018 13:50:07 -0500
Subject: [PATCH] Logging and whitespace changes. No logical changes

---
 .../lib/ZoneMinder/Memory/Mapped.pm           | 101 ++++++++----------
 1 file changed, 45 insertions(+), 56 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
index d782c6c9a..b9a8b6a1c 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
@@ -75,55 +75,50 @@ sub zmMemKey {
 
 sub zmMemAttach {
   my ( $monitor, $size ) = @_;
-  if ( ! $size ) {
-    Error( "No size passed to zmMemAttach for monitor $$monitor{Id}\n" );
+
+  if ( !$size ) {
+    Error("No size passed to zmMemAttach for monitor $$monitor{Id}");
     return undef;
   }
-  if ( !defined($monitor->{MMapAddr}) ) {
-
-    my $mmap_file = $Config{ZM_PATH_MAP}.'/zm.mmap.'.$monitor->{Id};
-    if ( ! -e $mmap_file ) {
-      Error( sprintf( "Memory map file '%s' does not exist.  zmc might not be running."
-            , $mmap_file
-            )
-          );
-      return undef;
-    }
-    my $mmap_file_size = -s $mmap_file;
-
-    if ( $mmap_file_size < $size ) {
-      Error( sprintf( "Memory map file '%s' should have been %d but was instead %d"
-            , $mmap_file
-            , $size
-            , $mmap_file_size
-            )
-          );
-      return undef;
-    }
-    my $MMAP;
-    if ( !open( $MMAP, '+<', $mmap_file ) ) {
-      Error( sprintf( "Can't open memory map file '%s': $!", $mmap_file ) );
-      return undef;
-    }
-    my $mmap = undef;
-    my $mmap_addr = mmap( $mmap, $size, PROT_READ|PROT_WRITE, MAP_SHARED, $MMAP );
-    if ( !$mmap_addr || !$mmap ) {
-      Error( sprintf( "Can't mmap to file '%s': $!\n", $mmap_file ) );
-      close( $MMAP );
-      return undef;
-    }
-    $monitor->{MMapHandle} = $MMAP;
-    $monitor->{MMapAddr} = $mmap_addr;
-    $monitor->{MMap} = \$mmap;
+  if ( defined($monitor->{MMapAddr}) ) {
+    Debug("zmMemAttach already attached at $monitor->{MMapAddr}");
+    return !undef;
   }
+
+  my $mmap_file = $Config{ZM_PATH_MAP}.'/zm.mmap.'.$monitor->{Id};
+  if ( ! -e $mmap_file ) {
+    Error("Memory map file '$mmap_file' does not exist.  zmc might not be running.");
+    return undef;
+  }
+  my $mmap_file_size = -s $mmap_file;
+
+  if ( $mmap_file_size < $size ) {
+    Error("Memory map file '$mmap_file' should have been $size but was instead $mmap_file_size");
+    return undef;
+  }
+  my $MMAP;
+  if ( !open($MMAP, '+<', $mmap_file) ) {
+    Error("Can't open memory map file '$mmap_file': $!");
+    return undef;
+  }
+  my $mmap = undef;
+  my $mmap_addr = mmap($mmap, $size, PROT_READ|PROT_WRITE, MAP_SHARED, $MMAP);
+  if ( !$mmap_addr || !$mmap ) {
+    Error("Can't mmap to file '$mmap_file': $!");
+    close($MMAP);
+    return undef;
+  }
+  $monitor->{MMapHandle} = $MMAP;
+  $monitor->{MMapAddr} = $mmap_addr;
+  $monitor->{MMap} = \$mmap;
   return !undef;
-}
+} # end sub zmMemAttach
 
 sub zmMemDetach {
   my $monitor = shift;
 
   if ( $monitor->{MMap} ) {
-    if ( ! munmap( ${$monitor->{MMap}} ) ) {
+    if ( ! munmap(${$monitor->{MMap}}) ) {
       Warn( "Unable to munmap for monitor $$monitor{Id}\n");
     }
     delete $monitor->{MMap};
@@ -132,7 +127,7 @@ sub zmMemDetach {
     delete $monitor->{MMapAddr};
   }
   if ( $monitor->{MMapHandle} ) {
-    close( $monitor->{MMapHandle} );
+    close($monitor->{MMapHandle});
     delete $monitor->{MMapHandle};
   }
 }
@@ -144,13 +139,10 @@ sub zmMemGet {
 
   my $mmap = $monitor->{MMap};
   if ( !$mmap || !$$mmap ) {
-    Error( sprintf( "Can't read from mapped memory for monitor '%d', gone away?"
-          , $monitor->{Id}
-          )
-        );
+    Error("Can't read from mapped memory for monitor '$$monitor{Id}', gone away?");
     return undef;
   }
-  my $data = substr( $$mmap, $offset, $size );
+  my $data = substr($$mmap, $offset, $size);
   return $data;
 }
 
@@ -162,23 +154,20 @@ sub zmMemPut {
 
   my $mmap = $monitor->{MMap};
   if ( !$mmap || !$$mmap ) {
-    Error( sprintf( "Can't write mapped memory for monitor '%d', gone away?"
-          , $monitor->{Id}
-          )
-        );
-    return( undef );
+    Error("Can't write mapped memory for monitor '$$monitor{Id}', gone away?");
+    return undef;
   }
-  substr( $$mmap, $offset, $size ) = $data;
-  return( !undef );
+  substr($$mmap, $offset, $size) = $data;
+  return !undef;
 }
 
 sub zmMemClean {
-  Debug( "Removing memory map files\n" );
+  Debug("Removing memory map files");
   my $mapPath = $Config{ZM_PATH_MAP}.'/zm.mmap.*';
   foreach my $mapFile( glob( $mapPath ) ) {
     ( $mapFile ) = $mapFile =~ /^(.+)$/;
-    Debug( "Removing memory map file '$mapFile'\n" );
-    unlink( $mapFile );
+    Debug("Removing memory map file '$mapFile'");
+    unlink($mapFile);
   }
 }