From 57f43ae5185b979a845820d9d10c411c881c64f1 Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Wed, 18 Jun 2014 10:57:27 -0500
Subject: [PATCH] Clean up how we initialize the result psobject

---
 windows/slurp.ps1    |  6 ++++--
 windows/win_ping.ps1 |  6 ++++--
 windows/win_stat.ps1 | 25 +++++++++++++------------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/windows/slurp.ps1 b/windows/slurp.ps1
index 8fedcdc2f9e..d224539ee63 100644
--- a/windows/slurp.ps1
+++ b/windows/slurp.ps1
@@ -39,7 +39,9 @@ If (-not $src)
 $bytes = [System.IO.File]::ReadAllBytes($src);
 $content = [System.Convert]::ToBase64String($bytes);
 
-$result = New-Object psobject;
+$result = New-Object psobject @{
+    changed = $false
+    encoding = "base64"
+};
 Set-Attr $result "content" $content;
-Set-Attr $result "encoding" "base64";
 echo $result | ConvertTo-Json;
diff --git a/windows/win_ping.ps1 b/windows/win_ping.ps1
index 6d1af14e9e3..0771ea31259 100644
--- a/windows/win_ping.ps1
+++ b/windows/win_ping.ps1
@@ -25,6 +25,8 @@ If ($params.data.GetType)
    $data = $params.data;
 }
 
-$result = New-Object psobject;
-Set-Attr $result "ping" $data;
+$result = New-Object psobject @{
+    changed = $false
+    ping = $data
+};
 echo $result | ConvertTo-Json;
diff --git a/windows/win_stat.ps1 b/windows/win_stat.ps1
index 50a46064d2e..d7b754a2834 100644
--- a/windows/win_stat.ps1
+++ b/windows/win_stat.ps1
@@ -28,36 +28,37 @@ If ($params.path.GetType)
 $get_md5 = $TRUE;
 If ($params.get_md5.GetType)
 {
-   $get_md5 = $params.get_md5;
+    $get_md5 = $params.get_md5;
 }
 
-$stat = New-Object psobject;
+$result = New-Object psobject @{
+    stat = New-Object psobject
+    changed = $false
+};
+
 If (Test-Path $path)
 {
-   Set-Attr $stat "exists" $TRUE;
+   Set-Attr $result.stat "exists" $TRUE;
    $info = Get-Item $path;
    If ($info.Directory) # Only files have the .Directory attribute.
    {
-      Set-Attr $stat "isdir" $FALSE;
-      Set-Attr $stat "size" $info.Length;
+      Set-Attr $result.stat "isdir" $FALSE;
+      Set-Attr $result.stat "size" $info.Length;
    }
    Else
    {
-      Set-Attr $stat "isdir" $TRUE;
+      Set-Attr $result.stat "isdir" $TRUE;
    }
 }
 Else
 {
-   Set-Attr $stat "exists" $FALSE;
+   Set-Attr $result.stat "exists" $FALSE;
 }
 
-If ($get_md5 -and $stat.exists -and -not $stat.isdir)
+If ($get_md5 -and $result.stat.exists -and -not $result.stat.isdir)
 {
    $path_md5 = (Get-FileHash -Path $path -Algorithm MD5).Hash.ToLower();
-   Set-Attr $stat "md5" $path_md5;
+   Set-Attr $result.stat "md5" $path_md5;
 }
 
-$result = New-Object psobject;
-Set-Attr $result "stat" $stat;
-Set-Attr $result "changed" $FALSE;
 echo $result | ConvertTo-Json;