From 6fcbe87a35c0a283dc24c02d0b9ee04c78df8d29 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 2 May 2014 07:10:29 +0200
Subject: [PATCH] fix typo

---
 PVE/API2.pm       | 14 +++++++-------
 PVE/HTTPServer.pm | 42 +++++++++++++++++++++---------------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/PVE/API2.pm b/PVE/API2.pm
index 1136812b..0169eb77 100644
--- a/PVE/API2.pm
+++ b/PVE/API2.pm
@@ -114,7 +114,7 @@ __PACKAGE__->register_method ({
 	return $res;
     }});
 
-# register result formaters
+# register result formatters
 
 my $prepare_response_data = sub {
     my ($format, $res) = @_;
@@ -151,7 +151,7 @@ my $prepare_response_data = sub {
     $res->{data} = $new;
 };
 
-PVE::HTTPServer::register_formater('json', sub {
+PVE::HTTPServer::register_formatter('json', sub {
     my ($res, $data, $param, $path, $auth) = @_;
 
     my $nocomp = 0;
@@ -166,7 +166,7 @@ PVE::HTTPServer::register_formater('json', sub {
 });
 
 
-PVE::HTTPServer::register_formater('extjs', sub {
+PVE::HTTPServer::register_formatter('extjs', sub {
     my ($res, $data, $param, $path, $auth) = @_;
 
     my $nocomp = 0;
@@ -180,7 +180,7 @@ PVE::HTTPServer::register_formater('extjs', sub {
     return ($raw, $ct, $nocomp);			     
 });
 
-PVE::HTTPServer::register_formater('htmljs', sub {
+PVE::HTTPServer::register_formatter('htmljs', sub {
     my ($res, $data, $param, $path, $auth) = @_;
  
     my $nocomp = 0;
@@ -197,7 +197,7 @@ PVE::HTTPServer::register_formater('htmljs', sub {
 });
 
 
-PVE::HTTPServer::register_formater('spiceconfig', sub {
+PVE::HTTPServer::register_formatter('spiceconfig', sub {
     my ($res, $data, $param, $path, $auth) = @_;
 
     my $nocomp = 0;
@@ -220,7 +220,7 @@ PVE::HTTPServer::register_formater('spiceconfig', sub {
     return ($raw, $ct, $nocomp);
 });
 
-PVE::HTTPServer::register_formater('png', sub {
+PVE::HTTPServer::register_formatter('png', sub {
     my ($res, $data, $param, $path, $auth) = @_;
 
     my $nocomp = 1;
@@ -245,7 +245,7 @@ PVE::HTTPServer::register_formater('png', sub {
     return ($raw, $ct, $nocomp);
 });
 
-PVE::HTTPServer::register_formater('html', sub {
+PVE::HTTPServer::register_formatter('html', sub {
     my ($res, $data, $param, $path, $auth) = @_;
 
     my $nocomp = 0;
diff --git a/PVE/HTTPServer.pm b/PVE/HTTPServer.pm
index e403edf0..2dfe22df 100755
--- a/PVE/HTTPServer.pm
+++ b/PVE/HTTPServer.pm
@@ -55,49 +55,49 @@ sub split_abs_uri {
     return wantarray ? ($rel_uri, $format) : $rel_uri;
 }
 
-# generic formater support
+# generic formatter support
 
-my $formater_hash = {};
+my $formatter_hash = {};
 
-sub register_formater {
+sub register_formatter {
     my ($format, $func) = @_;
 
-    die "formater '$format' already defined" if $formater_hash->{$format};
+    die "formatter '$format' already defined" if $formatter_hash->{$format};
 
-    $formater_hash->{$format} = {
+    $formatter_hash->{$format} = {
 	func => $func,
     };
 }
 
-sub get_formater {
+sub get_formatter {
     my ($format) = @_; 
 
      return undef if !$format;
 
-    my $info = $formater_hash->{$format};
+    my $info = $formatter_hash->{$format};
     return undef if !$info;
 
     return $info->{func};
 }
 
-my $login_formater_hash = {};
+my $login_formatter_hash = {};
 
-sub register_login_formater {
+sub register_login_formatter {
     my ($format, $func) = @_;
 
-    die "login formater '$format' already defined" if $login_formater_hash->{$format};
+    die "login formatter '$format' already defined" if $login_formatter_hash->{$format};
 
-    $login_formater_hash->{$format} = {
+    $login_formatter_hash->{$format} = {
 	func => $func,
     };
 }
 
-sub get_login_formater {
+sub get_login_formatter {
     my ($format) = @_; 
 
     return undef if !$format;
 
-    my $info = $login_formater_hash->{$format};
+    my $info = $login_formatter_hash->{$format};
     return undef if !$info;
 
     return $info->{func};
@@ -496,9 +496,9 @@ sub handle_api2_request {
 
 	my ($rel_uri, $format) = split_abs_uri($path);
 
-	my $formater = get_formater($format);
+	my $formatter = get_formatter($format);
 
-	if (!defined($formater)) {
+	if (!defined($formatter)) {
 	    $self->error($reqstate, HTTP_NOT_IMPLEMENTED, "no such uri $rel_uri, $format");
 	    return;
 	}
@@ -554,13 +554,13 @@ sub handle_api2_request {
 	    $delay = 0 if $delay < 0;
 	}
 
-	if ($res->{info} && $res->{info}->{formater}) {
-	    if (defined(my $func = $res->{info}->{formater}->{$format})) {
-		$formater = $func;
+	if ($res->{info} && $res->{info}->{formatter}) {
+	    if (defined(my $func = $res->{info}->{formatter}->{$format})) {
+		$formatter = $func;
 	    }
 	}
 
-	my ($raw, $ct, $nocomp) = &$formater($res, $res->{data}, $path, $auth);
+	my ($raw, $ct, $nocomp) = &$formatter($res, $res->{data}, $path, $auth);
 
 	my $resp;
 	if (ref($raw) && (ref($raw) eq 'HTTP::Response')) {
@@ -1014,8 +1014,8 @@ sub unshift_read_header {
 		    if (my $err = $@) {
 			# always delay unauthorized calls by 3 seconds
 			my $delay = 3;
-			if (my $formater = get_login_formater($format)) {
-			    my ($raw, $ct, $nocomp) = &$formater($path, $auth);
+			if (my $formatter = get_login_formatter($format)) {
+			    my ($raw, $ct, $nocomp) = &$formatter($path, $auth);
 			    my $resp;
 			    if (ref($raw) && (ref($raw) eq 'HTTP::Response')) {
 				$resp = $raw;