From ebd706cd37b42986f557e539aa24e0b58e4b223c Mon Sep 17 00:00:00 2001
From: ntruchsess <>
Date: Wed, 22 Oct 2014 22:16:03 +0000
Subject: [PATCH] MYSENSORS: fix perl warnings

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@6801 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 FHEM/10_MYSENSORS_DEVICE.pm          |  2 +-
 FHEM/lib/Device/MySensors/Message.pm | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/FHEM/10_MYSENSORS_DEVICE.pm b/FHEM/10_MYSENSORS_DEVICE.pm
index 3fb520cce..71e9541d7 100644
--- a/FHEM/10_MYSENSORS_DEVICE.pm
+++ b/FHEM/10_MYSENSORS_DEVICE.pm
@@ -316,7 +316,7 @@ sub sendClientMessage($%) {
   sendMessage($hash->{IODev},%msg);
 }
 
-sub mapReading($$) {
+sub mapReading($$$$) {
   my($hash, $type, $childId, $value) = @_;
 
   if(defined (my $mapping = $hash->{typeMappings}->{$type})) {
diff --git a/FHEM/lib/Device/MySensors/Message.pm b/FHEM/lib/Device/MySensors/Message.pm
index ca37e2e0e..f81eb04fa 100644
--- a/FHEM/lib/Device/MySensors/Message.pm
+++ b/FHEM/lib/Device/MySensors/Message.pm
@@ -24,20 +24,20 @@ sub parseMsg($) {
 
 sub createMsg(%) {
   my %msgRef = @_;
-  my @fields = ( $msgRef{'radioId'},
-                 $msgRef{'childId'},
-                 $msgRef{'cmd'},
-                 $msgRef{'ack'},
-                 $msgRef{'subType'},
-                 defined($msgRef{'payload'}) ? $msgRef{'payload'} : "" );
+  my @fields = ( $msgRef{'radioId'} // "",
+                 $msgRef{'childId'} // "",
+                 $msgRef{'cmd'} // "",
+                 $msgRef{'ack'} // "",
+                 $msgRef{'subType'} // "",
+                 $msgRef{'payload'}  // "");
   return join(';', @fields);
 }
 
 sub dumpMsg($) {
   my $msgRef = shift;
-  my $cmd = commandToStr($msgRef->{'cmd'});
-  my $st = subTypeToStr( $msgRef->{'cmd'}, $msgRef->{'subType'} );
-  return sprintf("Rx: fr=%03d ci=%03d c=%03d(%-14s) st=%03d(%-16s) ack=%d %s\n", $msgRef->{'radioId'}, $msgRef->{'childId'}, $msgRef->{'cmd'}, $cmd, $msgRef->{'subType'}, $st, $msgRef->{'ack'}, defined($msgRef->{'payload'}) ? "'".$msgRef->{'payload'}."'" : "");
+  my $cmd = defined $msgRef->{'cmd'} ? commandToStr($msgRef->{'cmd'}) : "''";
+  my $st = (defined $msgRef->{'cmd'} and defined $msgRef->{'subType'}) ? subTypeToStr( $msgRef->{'cmd'}, $msgRef->{'subType'} ) : "''";
+  return sprintf("Rx: fr=%03d ci=%03d c=%03d(%-14s) st=%03d(%-16s) ack=%d %s\n", $msgRef->{'radioId'} // "", $msgRef->{'childId'} // "", $msgRef->{'cmd'} // "", $cmd, $msgRef->{'subType'} // "", $st, $msgRef->{'ack'} // "", "'".$msgRef->{'payload'} // ""."'");
 }
 
 sub gettime {