From 9f5f1d131d981db3690ea871e619e37f39cb948a Mon Sep 17 00:00:00 2001
From: Philipp Wo <psycho160@gmx.at>
Date: Mon, 20 Apr 2020 16:13:19 +0200
Subject: [PATCH] removing prototypes started

---
 98_TadoAPI.pm | 59 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/98_TadoAPI.pm b/98_TadoAPI.pm
index 3901e45..6df9c0c 100644
--- a/98_TadoAPI.pm
+++ b/98_TadoAPI.pm
@@ -39,7 +39,6 @@ my $DataURL = qq{https://my.tado.com/api/v2/me};
 my $QueryURL = qq{https://my.tado.com/api/v2/homes};
 my $tokenFile = "./FHEM/FhemUtils/TadoAPI_token";
 my $header = {};
-my $data = {};
 my $reqDebug = 5;
 
 # helpers
@@ -66,35 +65,39 @@ my %gets = (
 );
 
 sub
-TadoAPI_Initialize($)
+TadoAPI_Initialize
 {
-  my ($hash) = @_;
+  my $hash = shift;
+  my $TYPE = "TadoAPI";
 
-  $hash->{DefFn}     = "TadoAPI_Define";
-  $hash->{InitFn}    = "TadoAPI_Init";
-  $hash->{SetFn}     = "TadoAPI_Set";
-  $hash->{GetFn}     = "TadoAPI_Get";
-  $hash->{AttrList}  =
-  "homeID " .
-  "mobileID " .
-  "showPosData:0,1 " .
-  "updateIntervall " .
-  $main::readingFnAttributes;
-
-  return;
+  $hash->{DefFn}     = $TYPE."_Define";
+  $hash->{InitFn}    = $TYPE."_Init";
+  $hash->{SetFn}     = $TYPE."_Set";
+  $hash->{GetFn}     = $TYPE."_Get";
+  $hash->{AttrList}  = ""
+    . "homeID "
+    . "mobileID "
+    . "showPosData:0,1 "
+    . "updateIntervall "
+    . $readingFnAttributes
+  ;
 }
 
-sub TadoAPI_Init($$)
+sub TadoAPI_Init
 {
-  my ($hash,$args) = @_;
+  my $hash = shift;
+  my @args = @_;
+
   my $u = "wrong syntax: define <name> TadoAPI <username> <homeID> [<mobileID>]";
-  return $u if(int(@$args) < 2);
+  return $u if(int(@args) < 2);
   return;
 }
 
-sub TadoAPI_Define($$)
+sub TadoAPI_Define
 {
-  my ($hash, $def) = @_;
+  my $hash = shift;
+  my $def = shift;
+
   my @a    = split( "[ \t]+", $def );
   my $name = shift @a;
   my $type = shift @a;
@@ -452,7 +455,7 @@ sub TadoAPI_NewTokenRequest(@) {
 
   Log3 $name, 5, "TadoAPI $name" . ": " . "calling NewTokenRequest()";
 
-  $data = {
+  my $data = {
     client_id => $client_id,
     client_secret => $client_secret,
     username => $username,
@@ -511,7 +514,7 @@ sub TadoAPI_TokenRefresh(@) {
   eval { $Token = decode_json(<$TOKENFILE>)};
   close($TOKENFILE);
 
-  $data = {
+  my $data = {
     client_id => $client_id,
     client_secret => $client_secret,
     scope => $scope,
@@ -921,7 +924,7 @@ sub TadoAPI_SetGeoByIdCallback($){
   }
   elsif($data ne "")
   {
-    Log3 $name, 3, "url ".$param->{url}." returned: $data";
+    Log3 $name, 3, "SetGeoById URL: ".$param->{url}." returned: $data";
   }
   return;
 }
@@ -1050,12 +1053,13 @@ sub TadoAPI_SetGeoById(@){
   my $homeID = $attr{$name}{homeID};
 	my $URL=$QueryURL . qq{/$homeID/mobileDevices/$mobileID/settings};
   my $CurrentTokenData = TadoAPI_LoadToken($hash);
+  my $data = {};
 
   if(defined($CurrentTokenData)){
     if($geo){
-      my $data = { geoTrackingEnabled=>"true" };
+      $data = { geoTrackingEnabled=>"true" };
     }else{
-      my $data = { geoTrackingEnabled=>"false" };
+      $data = { geoTrackingEnabled=>"false" };
     }
 
     $data = encode_json($data);
@@ -1071,6 +1075,7 @@ sub TadoAPI_SetGeoById(@){
           callback      => \&TadoAPI_SetGeoByIdCallback
       };
     Log3 $name, $reqDebug, "TadoAPI $name" . ": " . "Request $URL";
+    Log3 $name, $reqDebug, "TadoAPI $name" . ": " . "PUT setting $data";
 		HttpUtils_NonblockingGet($request);
   }
   return;
@@ -1123,7 +1128,7 @@ sub TadoAPI_GetHomeId(@){
     }
     elsif($data ne "")
     {
-      Log3 $name, 5, "url ".$param->{url}." returned: $data";
+      Log3 $name, 5, "URL ".$param->{url}." returned: $data";
       my $decoded_data = eval { decode_json($data) };
       if ($@){
         Log3 $name, 3, "TadoAPI $name" . ": " . "GetHomeId: Decode_json failed, invalid json. error:$@" if $@;
@@ -1166,7 +1171,7 @@ sub TadoAPI_GetGeoById(@){
       }
       elsif($data ne "")
       {
-        Log3 $name, 5, "url ".$param->{url}." returned: $data";
+        Log3 $name, 5, "GetGeoById URL: ".$param->{url}." returned: $data";
         my $decoded_data = eval { decode_json($data) };
         if ($@){
           Log3 $name, 3, "TadoAPI $name" . ": " . "GetGeoById: Decode_json failed, invalid json. error:$@\n" if $@;