* Merge changes from prposed changes

[infobot.git] / src / Shm.pl

diff --git a/src/Shm.pl b/src/Shm.pl
index 646c2097ff9c8bbeaa001a3b808ac2caff15bced..73b30fab86784ac08291d499fc89eac550787f0d 100644 (file)
--- a/src/Shm.pl
+++ b/src/Shm.pl
@@ -15,7 +15,7 @@ sub openSHM {
     my $IPC_PRIVATE = 0;
     my $size = 2000;
 
-    if (&IsParam("noSHM")) {
+    if (&IsParam('noSHM')) {
        &status("Shared memory: Disabled. WARNING: bot may become unreliable");
        return 0;
     }
@@ -51,7 +51,7 @@ sub shmRead {
     my $size = 3*80;
     my $retval = '';
 
-    return '' if (&IsParam("noSHM"));
+    return '' if (&IsParam('noSHM'));
 
     if (shmread($key,$retval,$position,$size)) {
        #&DEBUG("shmRead($key): $retval");
@@ -73,7 +73,7 @@ sub shmWrite {
     my $position = 0;
     my $size = 80*3;
 
-    return if (&IsParam("noSHM"));
+    return if (&IsParam('noSHM'));
 
     $shm_keys{$keys}{accessed} = 1;
 
@@ -93,7 +93,7 @@ sub shmWrite {
 
     my $read = &shmRead($key);
     $read =~ s/\0+//g;
-    if ($read eq "") {
+    if ($read eq '') {
        $str = sprintf("%s:%d:%d: ", $param{ircUser}, $bot_pid, time());
     } else {
        $str = $read ."||". $str;
@@ -241,8 +241,8 @@ sub shmFlush {
     return if ($$ != $::bot_pid); # fork protection.
 
     if (@_) {
-       &ScheduleThis(15, "shmFlush");
-       return if ($_[0] eq "2");
+       &ScheduleThis(15, 'shmFlush');
+       return if ($_[0] eq '2');
     }
 
     my $time;
@@ -284,7 +284,9 @@ sub shmFlush {
        }
     }
 
-    &shmWrite($shm,"") if ($shmmsg ne "");
+    &shmWrite($shm,'') if ($shmmsg ne '');
 }
 
 1;
+
+# vim:ts=4:sw=4:expandtab:tw=80