From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 26 Jan 2012 12:35:33 +0000 (+0100)
Subject: code cleanup
X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=commitdiff_plain;h=cab28ea50b815419dc4a4dc15ac220c2ca170f38;hp=399932c682182ffeeb95f67c5d99aee587c57d0e

code cleanup
---

diff --git a/PVE/API2/Pool.pm b/PVE/API2/Pool.pm
index c4b1e20..f95df28 100644
--- a/PVE/API2/Pool.pm
+++ b/PVE/API2/Pool.pm
@@ -14,22 +14,6 @@ use PVE::RESTHandler;
 
 use base qw(PVE::RESTHandler);
 
-my $extract_pool_data = sub {
-    my ($data, $full) = @_;
-
-    my $res = {};
-
-    $res->{comment} = $data->{comment} if defined($data->{comment});
-
-    return $res if !$full;
-
-    $res->{vms} = $data->{vms} ? [ keys %{$data->{vms}} ] : [];
- 
-    $res->{storages} = $data->{storage} ? [ keys %{$data->{storage}} ] : [];
-
-    return $res;
-};
-
 __PACKAGE__->register_method ({
     name => 'index', 
     path => '', 
@@ -61,9 +45,10 @@ __PACKAGE__->register_method ({
 
 	my $usercfg = $rpcenv->{user_cfg};
 
-	foreach my $poolpath (keys %{$usercfg->{pools}}) {
-	    my $entry = &$extract_pool_data($usercfg->{pools}->{$poolpath});
-	    $entry->{poolid} = $poolpath;
+	foreach my $pool (keys %{$usercfg->{pools}}) {
+	    my $entry = { poolid => $pool };
+	    my $data = $usercfg->{pools}->{$pool};
+	    $entry->{comment} = $data->{comment} if defined($data->{comment});
 	    push @$res, $entry;
 	}